Mercurial > hg > freeDiameter
annotate libfdproto/dictionary.c @ 1316:2e868f71832f
Tentative fix for invalid pointers reported by Thomas.
| author | Sebastien Decugis <sdecugis@freediameter.net> |
|---|---|
| date | Sat, 10 Dec 2016 22:12:02 +0800 |
| parents | ab6457399be2 |
| children | ab7cb954f17e |
| rev | line source |
|---|---|
| 0 | 1 /********************************************************************************************************* |
| 2 * Software License Agreement (BSD License) * | |
|
740
4a9f08d6b6ba
Updated my mail address
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
706
diff
changeset
|
3 * Author: Sebastien Decugis <sdecugis@freediameter.net> * |
| 0 | 4 * * |
|
1281
ab6457399be2
Updated copyright information
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1268
diff
changeset
|
5 * Copyright (c) 2015, WIDE Project and NICT * |
| 0 | 6 * All rights reserved. * |
| 7 * * | |
| 8 * Redistribution and use of this software in source and binary forms, with or without modification, are * | |
| 9 * permitted provided that the following conditions are met: * | |
| 10 * * | |
| 11 * * Redistributions of source code must retain the above * | |
| 12 * copyright notice, this list of conditions and the * | |
| 13 * following disclaimer. * | |
| 14 * * | |
| 15 * * Redistributions in binary form must reproduce the above * | |
| 16 * copyright notice, this list of conditions and the * | |
| 17 * following disclaimer in the documentation and/or other * | |
| 18 * materials provided with the distribution. * | |
| 19 * * | |
| 20 * * Neither the name of the WIDE Project or NICT nor the * | |
| 21 * names of its contributors may be used to endorse or * | |
| 22 * promote products derived from this software without * | |
| 23 * specific prior written permission of WIDE Project and * | |
| 24 * NICT. * | |
| 25 * * | |
| 26 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED * | |
| 27 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A * | |
| 28 * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR * | |
| 29 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * | |
| 30 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * | |
| 31 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR * | |
| 32 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * | |
| 33 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * | |
| 34 *********************************************************************************************************/ | |
| 35 | |
|
658
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
36 #include "fdproto-internal.h" |
|
1027
0117a7746b21
Fix a number of errors and warnings introduced/highlighted by recent commits
Sebastien Decugis <sdecugis@freediameter.net>
parents:
979
diff
changeset
|
37 #include <inttypes.h> |
| 0 | 38 |
| 39 /* Names of the base types */ | |
| 40 const char * type_base_name[] = { /* must keep in sync with dict_avp_basetype */ | |
| 41 "GROUPED", /* AVP_TYPE_GROUPED */ | |
| 42 "OCTETSTRING", /* AVP_TYPE_OCTETSTRING */ | |
| 43 "INTEGER32", /* AVP_TYPE_INTEGER32 */ | |
| 44 "INTEGER64", /* AVP_TYPE_INTEGER64 */ | |
| 45 "UNSIGNED32", /* AVP_TYPE_UNSIGNED32 */ | |
| 46 "UNSIGNED64", /* AVP_TYPE_UNSIGNED64 */ | |
| 47 "FLOAT32", /* AVP_TYPE_FLOAT32 */ | |
| 48 "FLOAT64" /* AVP_TYPE_FLOAT64 */ | |
| 49 }; | |
| 50 | |
| 51 /* The number of lists in an object */ | |
| 52 #define NB_LISTS_PER_OBJ 3 | |
| 53 | |
| 54 /* Some eye catchers definitions */ | |
| 55 #define OBJECT_EYECATCHER (0x0b13c7) | |
| 56 #define DICT_EYECATCHER (0x00d1c7) | |
| 57 | |
| 58 /* Definition of the dictionary objects */ | |
| 59 struct dict_object { | |
| 60 enum dict_object_type type; /* What type of object is this? */ | |
| 61 int objeyec;/* eyecatcher for this object */ | |
| 62 int typeyec;/* eyecatcher for this type of object */ | |
| 63 struct dictionary *dico; /* The dictionary this object belongs to */ | |
| 64 | |
| 65 union { | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
66 struct dict_vendor_data vendor; /* datastr_len = strlen(vendor_name) */ |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
67 struct dict_application_data application; /* datastr_len = strlen(application_name) */ |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
68 struct dict_type_data type; /* datastr_len = strlen(type_name) */ |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
69 struct dict_enumval_data enumval; /* datastr_len = strlen(enum_name) */ |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
70 struct dict_avp_data avp; /* datastr_len = strlen(avp_name) */ |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
71 struct dict_cmd_data cmd; /* datastr_len = strlen(cmd_name) */ |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
72 struct dict_rule_data rule; /* datastr_len = 0 */ |
| 0 | 73 } data; /* The data of this object */ |
| 74 | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
75 size_t datastr_len; /* cached length of the string inside the data. Saved when the object is created. */ |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
76 |
| 0 | 77 struct dict_object * parent; /* The parent of this object, if any */ |
| 78 | |
| 79 struct fd_list list[NB_LISTS_PER_OBJ];/* used to chain objects.*/ | |
| 80 /* More information about the lists : | |
| 81 | |
| 972 | 82 - the use for each list depends on the type of object. See detail below. |
| 0 | 83 |
| 84 - a sentinel for a list has its 'o' field cleared. (this is the criteria to detect end of a loop) | |
| 85 | |
| 972 | 86 - The lists are always ordered. The criteria are described below. the functions to order them are referenced in dict_obj_info |
| 0 | 87 |
| 88 - The dict_lock must be held for any list operation. | |
| 89 | |
| 90 => VENDORS: | |
| 91 list[0]: list of the vendors, ordered by their id. The sentinel is g_dict_vendors (vendor with id 0) | |
| 92 list[1]: sentinel for the list of AVPs from this vendor, ordered by AVP code. | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
93 list[2]: sentinel for the list of AVPs from this vendor, ordered by AVP name (fd_os_cmp). |
| 0 | 94 |
| 95 => APPLICATIONS: | |
| 96 list[0]: list of the applications, ordered by their id. The sentinel is g_dict_applications (application with id 0) | |
| 97 list[1]: not used | |
| 98 list[2]: not used. | |
| 99 | |
| 100 => TYPES: | |
| 101 list[0]: list of the types, ordered by their names. The sentinel is g_list_types. | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
102 list[1]: sentinel for the type_enum list of this type, ordered by their constant name (fd_os_cmp). |
| 0 | 103 list[2]: sentinel for the type_enum list of this type, ordered by their constant value. |
| 104 | |
| 105 => TYPE_ENUMS: | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
106 list[0]: list of the contants for a given type, ordered by the constant name (fd_os_cmp). Sentinel is a (list[1]) element of a TYPE object. |
| 0 | 107 list[1]: list of the contants for a given type, ordered by the constant value. Sentinel is a (list[2]) element of a TYPE object. |
| 108 list[2]: not used | |
| 109 | |
| 110 => AVPS: | |
| 111 list[0]: list of the AVP from a given vendor, ordered by avp code. Sentinel is a list[1] element of a VENDOR object. | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
112 list[1]: list of the AVP from a given vendor, ordered by avp name (fd_os_cmp). Sentinel is a list[2] element of a VENDOR object. |
| 0 | 113 list[2]: sentinel for the rule list that apply to this AVP. |
| 114 | |
| 115 => COMMANDS: | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
116 list[0]: list of the commands, ordered by their names (fd_os_cmp). The sentinel is g_list_cmd_name. |
| 0 | 117 list[1]: list of the commands, ordered by their command code and 'R' flag. The sentinel is g_list_cmd_code. |
| 118 list[2]: sentinel for the rule list that apply to this command. | |
| 119 | |
| 120 => RULES: | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
121 list[0]: list of the rules for a given (grouped) AVP or Command, ordered by the AVP vendor & code to which they refer. sentinel is list[2] of a command or (grouped) avp. |
| 0 | 122 list[1]: not used |
| 123 list[2]: not used. | |
| 124 | |
| 125 */ | |
| 126 | |
| 127 /* Sentinel for the dispatch callbacks */ | |
| 128 struct fd_list disp_cbs; | |
| 129 | |
| 130 }; | |
| 131 | |
| 132 /* Definition of the dictionary structure */ | |
| 133 struct dictionary { | |
| 134 int dict_eyec; /* Eye-catcher for the dictionary (DICT_EYECATCHER) */ | |
| 135 | |
| 136 pthread_rwlock_t dict_lock; /* The global rwlock for the dictionary */ | |
| 137 | |
| 138 struct dict_object dict_vendors; /* Sentinel for the list of vendors, corresponding to vendor 0 */ | |
| 139 struct dict_object dict_applications; /* Sentinel for the list of applications, corresponding to app 0 */ | |
| 140 struct fd_list dict_types; /* Sentinel for the list of types */ | |
| 141 struct fd_list dict_cmd_name; /* Sentinel for the list of commands, ordered by names */ | |
| 142 struct fd_list dict_cmd_code; /* Sentinel for the list of commands, ordered by codes */ | |
| 143 | |
| 144 struct dict_object dict_cmd_error; /* Special command object for answers with the 'E' bit set */ | |
| 145 | |
|
446
66f58cecf3cd
Fix invalid array size (found by valgrind)
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
258
diff
changeset
|
146 int dict_count[DICT_TYPE_MAX + 1]; /* Number of objects of each type */ |
| 0 | 147 }; |
| 148 | |
| 149 /* Forward declarations of dump functions */ | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
150 static DECLARE_FD_DUMP_PROTOTYPE(dump_vendor_data, void * data ); |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
151 static DECLARE_FD_DUMP_PROTOTYPE(dump_application_data, void * data ); |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
152 static DECLARE_FD_DUMP_PROTOTYPE(dump_type_data, void * data ); |
| 0 | 153 /* the dump function for enum has a different prototype since it need the datatype */ |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
154 static DECLARE_FD_DUMP_PROTOTYPE(dump_avp_data, void * data ); |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
155 static DECLARE_FD_DUMP_PROTOTYPE(dump_command_data, void * data ); |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
156 static DECLARE_FD_DUMP_PROTOTYPE(dump_rule_data, void * data ); |
| 0 | 157 |
| 158 /* Forward declarations of search functions */ | |
|
907
b772af200865
Add a few const declaration so that C++ is less picky
Sebastien Decugis <sdecugis@freediameter.net>
parents:
906
diff
changeset
|
159 static int search_vendor ( struct dictionary * dict, int criteria, const void * what, struct dict_object **result ); |
|
b772af200865
Add a few const declaration so that C++ is less picky
Sebastien Decugis <sdecugis@freediameter.net>
parents:
906
diff
changeset
|
160 static int search_application ( struct dictionary * dict, int criteria, const void * what, struct dict_object **result ); |
|
b772af200865
Add a few const declaration so that C++ is less picky
Sebastien Decugis <sdecugis@freediameter.net>
parents:
906
diff
changeset
|
161 static int search_type ( struct dictionary * dict, int criteria, const void * what, struct dict_object **result ); |
|
b772af200865
Add a few const declaration so that C++ is less picky
Sebastien Decugis <sdecugis@freediameter.net>
parents:
906
diff
changeset
|
162 static int search_enumval ( struct dictionary * dict, int criteria, const void * what, struct dict_object **result ); |
|
b772af200865
Add a few const declaration so that C++ is less picky
Sebastien Decugis <sdecugis@freediameter.net>
parents:
906
diff
changeset
|
163 static int search_avp ( struct dictionary * dict, int criteria, const void * what, struct dict_object **result ); |
|
b772af200865
Add a few const declaration so that C++ is less picky
Sebastien Decugis <sdecugis@freediameter.net>
parents:
906
diff
changeset
|
164 static int search_cmd ( struct dictionary * dict, int criteria, const void * what, struct dict_object **result ); |
|
b772af200865
Add a few const declaration so that C++ is less picky
Sebastien Decugis <sdecugis@freediameter.net>
parents:
906
diff
changeset
|
165 static int search_rule ( struct dictionary * dict, int criteria, const void * what, struct dict_object **result ); |
| 0 | 166 |
| 167 /* The following array contains lot of data about the different types of objects, for automated handling */ | |
| 168 static struct { | |
| 169 enum dict_object_type type; /* information for this type */ | |
| 170 char * name; /* string describing this object, for debug */ | |
| 171 size_t datasize; /* The size of the data structure */ | |
| 172 int parent; /* 0: never; 1: may; 2: must */ | |
| 173 enum dict_object_type parenttype; /* The type of the parent, when relevant */ | |
| 174 int eyecatcher; /* A kind of signature for this object */ | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
175 DECLARE_FD_DUMP_PROTOTYPE( (*dump_data), void * data ); /* The function to dump the data section */ |
|
907
b772af200865
Add a few const declaration so that C++ is less picky
Sebastien Decugis <sdecugis@freediameter.net>
parents:
906
diff
changeset
|
176 int (*search_fct)(struct dictionary * dict, int criteria, const void * what, struct dict_object **result );; /* The function to search an object of this type */ |
| 0 | 177 int haslist[NB_LISTS_PER_OBJ]; /* Tell if this list is used */ |
| 178 } dict_obj_info[] = { { 0, "(error)", 0, 0, 0, 0, NULL, NULL, {0, 0, 0} } | |
| 179 | |
| 180 /* type name datasize parent parenttype | |
| 181 eyecatcher dump_data search_fct, haslist[] */ | |
| 182 | |
| 183 ,{ DICT_VENDOR, "VENDOR", sizeof(struct dict_vendor_data), 0, 0, | |
| 184 OBJECT_EYECATCHER + 1, dump_vendor_data, search_vendor, { 1, 0, 0 } } | |
| 185 | |
| 186 ,{ DICT_APPLICATION, "APPLICATION", sizeof(struct dict_application_data), 1, DICT_VENDOR, | |
| 187 OBJECT_EYECATCHER + 2, dump_application_data, search_application, { 1, 0, 0 } } | |
| 188 | |
| 189 ,{ DICT_TYPE, "TYPE", sizeof(struct dict_type_data), 1, DICT_APPLICATION, | |
| 190 OBJECT_EYECATCHER + 3, dump_type_data, search_type, { 1, 0, 0 } } | |
| 191 | |
| 192 ,{ DICT_ENUMVAL, "ENUMVAL", sizeof(struct dict_enumval_data), 2, DICT_TYPE, | |
| 193 OBJECT_EYECATCHER + 4, NULL, search_enumval, { 1, 1, 0 } } | |
| 194 | |
| 195 ,{ DICT_AVP, "AVP", sizeof(struct dict_avp_data), 1, DICT_TYPE, | |
| 196 OBJECT_EYECATCHER + 5, dump_avp_data, search_avp, { 1, 1, 0 } } | |
| 197 | |
| 198 ,{ DICT_COMMAND, "COMMAND", sizeof(struct dict_cmd_data), 1, DICT_APPLICATION, | |
| 199 OBJECT_EYECATCHER + 6, dump_command_data, search_cmd, { 1, 1, 0 } } | |
| 200 | |
| 201 ,{ DICT_RULE, "RULE", sizeof(struct dict_rule_data), 2, -1 /* special case: grouped avp or command */, | |
| 202 OBJECT_EYECATCHER + 7, dump_rule_data, search_rule, { 1, 0, 0 } } | |
| 203 | |
| 204 }; | |
| 205 | |
| 206 /* Macro to verify a "type" value */ | |
| 207 #define CHECK_TYPE( type ) ( ((type) > 0) && ((type) <= DICT_TYPE_MAX) ) | |
| 208 | |
| 209 /* Cast macro */ | |
| 210 #define _O( object ) ((struct dict_object *) (object)) | |
| 211 | |
| 212 /* Get information line for a given object */ | |
| 213 #define _OBINFO(object) (dict_obj_info[CHECK_TYPE(_O(object)->type) ? _O(object)->type : 0]) | |
| 214 | |
| 215 | |
| 216 | |
| 217 | |
| 218 /*******************************************************************************************************/ | |
| 219 /*******************************************************************************************************/ | |
| 220 /* */ | |
| 221 /* Objects management */ | |
| 222 /* */ | |
| 223 /*******************************************************************************************************/ | |
| 224 /*******************************************************************************************************/ | |
| 225 | |
| 226 /* Functions to manage the objects creation and destruction. */ | |
| 227 | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
228 /* Duplicate a string inplace, save its length */ |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
229 #define DUP_string_len( str, plen ) { \ |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
230 *(plen) = strlen((str)); \ |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
231 str = os0dup( str, *(plen)); \ |
| 0 | 232 } |
| 233 | |
| 234 /* Initialize an object */ | |
| 235 static void init_object( struct dict_object * obj, enum dict_object_type type ) | |
| 236 { | |
| 237 int i; | |
| 238 | |
| 239 TRACE_ENTRY("%p %d", obj, type); | |
| 240 | |
| 241 /* Clean the object first */ | |
| 242 memset ( obj, 0, sizeof(struct dict_object)); | |
| 243 | |
| 244 CHECK_PARAMS_DO( CHECK_TYPE(type), return ); | |
| 245 | |
| 246 obj->type = type; | |
| 247 obj->objeyec = OBJECT_EYECATCHER; | |
| 248 obj->typeyec = _OBINFO(obj).eyecatcher; | |
| 249 | |
| 250 /* We don't initialize the data nor the parent here */ | |
| 251 | |
| 252 /* Now init the lists */ | |
| 253 for (i=0; i<NB_LISTS_PER_OBJ; i++) { | |
| 254 if (_OBINFO(obj).haslist[i] != 0) | |
| 255 fd_list_init(&obj->list[i], obj); | |
| 256 else | |
| 257 fd_list_init(&obj->list[i], NULL); | |
| 258 } | |
| 259 | |
| 260 fd_list_init(&obj->disp_cbs, NULL); | |
| 261 } | |
| 262 | |
| 263 /* Initialize the "data" part of an object */ | |
|
1316
2e868f71832f
Tentative fix for invalid pointers reported by Thomas.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1281
diff
changeset
|
264 static int init_object_data(struct dict_object * dest, void * source, enum dict_object_type type, int dupos) |
| 0 | 265 { |
| 266 TRACE_ENTRY("%p %p %d", dest, source, type); | |
| 267 CHECK_PARAMS( dest && source && CHECK_TYPE(type) ); | |
| 268 | |
| 269 /* Generic: copy the full data structure */ | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
270 memcpy( &dest->data, source, dict_obj_info[type].datasize ); |
| 0 | 271 |
| 272 /* Then strings must be duplicated, not copied */ | |
| 273 /* This function might be simplified by always defining the "name" field as the first field of the structures, but... it's error-prone */ | |
| 274 switch (type) { | |
| 275 case DICT_VENDOR: | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
276 DUP_string_len( dest->data.vendor.vendor_name, &dest->datastr_len ); |
| 0 | 277 break; |
| 278 | |
| 279 case DICT_APPLICATION: | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
280 DUP_string_len( dest->data.application.application_name, &dest->datastr_len ); |
| 0 | 281 break; |
| 282 | |
| 283 case DICT_TYPE: | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
284 DUP_string_len( dest->data.type.type_name, &dest->datastr_len ); |
| 0 | 285 break; |
| 286 | |
| 287 case DICT_ENUMVAL: | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
288 DUP_string_len( dest->data.enumval.enum_name, &dest->datastr_len ); |
|
1316
2e868f71832f
Tentative fix for invalid pointers reported by Thomas.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1281
diff
changeset
|
289 if (dupos) { |
|
2e868f71832f
Tentative fix for invalid pointers reported by Thomas.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1281
diff
changeset
|
290 // we also need to duplicate the octetstring constant value since it is a pointer. |
|
2e868f71832f
Tentative fix for invalid pointers reported by Thomas.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1281
diff
changeset
|
291 dest->data.enumval.enum_value.os.data = os0dup( |
|
2e868f71832f
Tentative fix for invalid pointers reported by Thomas.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1281
diff
changeset
|
292 ((struct dict_enumval_data *)source)->enum_value.os.data, |
|
2e868f71832f
Tentative fix for invalid pointers reported by Thomas.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1281
diff
changeset
|
293 ((struct dict_enumval_data *)source)->enum_value.os.len |
|
2e868f71832f
Tentative fix for invalid pointers reported by Thomas.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1281
diff
changeset
|
294 ); |
|
2e868f71832f
Tentative fix for invalid pointers reported by Thomas.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1281
diff
changeset
|
295 } |
| 0 | 296 break; |
| 297 | |
| 298 case DICT_AVP: | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
299 DUP_string_len( dest->data.avp.avp_name, &dest->datastr_len ); |
| 0 | 300 break; |
| 301 | |
| 302 case DICT_COMMAND: | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
303 DUP_string_len( dest->data.cmd.cmd_name, &dest->datastr_len ); |
| 0 | 304 break; |
| 305 | |
| 306 default: | |
| 307 /* Nothing to do for RULES */ | |
| 308 ; | |
| 309 } | |
| 310 | |
| 311 return 0; | |
| 312 } | |
| 313 | |
| 314 /* Check that an object is valid (1: OK, 0: error) */ | |
| 315 static int verify_object( struct dict_object * obj ) | |
| 316 { | |
| 317 TRACE_ENTRY("%p", obj); | |
| 318 | |
| 319 CHECK_PARAMS_DO( obj | |
| 320 && (obj->objeyec == OBJECT_EYECATCHER) | |
| 321 && CHECK_TYPE(obj->type) | |
| 322 && (obj->typeyec == dict_obj_info[obj->type].eyecatcher), | |
| 323 { | |
| 324 if (obj) { | |
| 979 | 325 TRACE_DEBUG(FULL, "Invalid object: %p, obj->objeyec: %x/%x, obj->type: %d, obj->objeyec: %x/%x, obj->typeyec: %x/%x", |
| 0 | 326 obj, |
| 327 obj->objeyec, OBJECT_EYECATCHER, | |
| 328 obj->type, | |
| 329 obj->objeyec, OBJECT_EYECATCHER, | |
| 330 obj->typeyec, _OBINFO(obj).eyecatcher); | |
|
658
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
331 } else { |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
332 TRACE_DEBUG(FULL, "Invalid object : NULL pointer"); |
| 0 | 333 } |
| 334 return 0; | |
| 335 } ); | |
| 336 | |
| 337 /* The object is probably valid. */ | |
| 338 return 1; | |
| 339 } | |
| 340 | |
| 341 /* Free the data associated to an object */ | |
| 342 static void destroy_object_data(struct dict_object * obj) | |
| 343 { | |
| 344 /* TRACE_ENTRY("%p", obj); */ | |
| 345 | |
| 346 switch (obj->type) { | |
| 347 case DICT_VENDOR: | |
| 348 free( obj->data.vendor.vendor_name ); | |
| 349 break; | |
| 350 | |
| 351 case DICT_APPLICATION: | |
| 352 free( obj->data.application.application_name ); | |
| 353 break; | |
| 354 | |
| 355 case DICT_TYPE: | |
| 356 free( obj->data.type.type_name ); | |
| 357 break; | |
| 358 | |
| 359 case DICT_ENUMVAL: | |
| 360 free( obj->data.enumval.enum_name ); | |
| 361 break; | |
| 362 | |
| 363 case DICT_AVP: | |
| 364 free( obj->data.avp.avp_name ); | |
| 365 break; | |
| 366 | |
| 367 case DICT_COMMAND: | |
| 368 free( obj->data.cmd.cmd_name ); | |
| 369 break; | |
| 370 | |
| 371 default: | |
| 372 /* nothing to do */ | |
| 373 ; | |
| 374 } | |
| 375 } | |
| 376 | |
| 377 /* Forward declaration */ | |
| 378 static void destroy_object(struct dict_object * obj); | |
| 379 | |
| 380 /* Destroy all objects in a list - the lock must be held */ | |
| 381 static void destroy_list(struct fd_list * head) | |
| 382 { | |
| 383 /* TRACE_ENTRY("%p", head); */ | |
| 384 | |
| 385 /* loop in the list */ | |
| 386 while (!FD_IS_LIST_EMPTY(head)) | |
| 387 { | |
| 388 /* When destroying the object, it is unlinked from the list */ | |
| 389 destroy_object(_O(head->next->o)); | |
| 390 } | |
| 391 } | |
| 392 | |
| 393 /* Free an object and its sublists */ | |
| 394 static void destroy_object(struct dict_object * obj) | |
| 395 { | |
| 396 int i; | |
| 397 | |
| 398 /* TRACE_ENTRY("%p", obj); */ | |
| 399 | |
| 400 /* Update global count */ | |
| 401 if (obj->dico) | |
| 402 obj->dico->dict_count[obj->type]--; | |
| 403 | |
| 404 /* Mark the object as invalid */ | |
| 405 obj->objeyec = 0xdead; | |
| 406 | |
| 407 /* First, destroy the data associated to the object */ | |
| 408 destroy_object_data(obj); | |
| 409 | |
| 410 for (i=0; i<NB_LISTS_PER_OBJ; i++) { | |
| 411 if (_OBINFO(obj).haslist[i]) | |
| 412 /* unlink the element from the list */ | |
| 413 fd_list_unlink( &obj->list[i] ); | |
| 414 else | |
| 415 /* This is either a sentinel or unused (=emtpy) list, let's destroy it */ | |
| 416 destroy_list( &obj->list[i] ); | |
| 417 } | |
| 418 | |
| 419 /* Unlink all elements from the dispatch list; they will be freed when callback is unregistered */ | |
|
7
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
1
diff
changeset
|
420 CHECK_POSIX_DO( pthread_rwlock_wrlock(&fd_disp_lock), /* continue */ ); |
| 0 | 421 while (!FD_IS_LIST_EMPTY(&obj->disp_cbs)) { |
| 422 fd_list_unlink( obj->disp_cbs.next ); | |
| 423 } | |
|
7
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
1
diff
changeset
|
424 CHECK_POSIX_DO( pthread_rwlock_unlock(&fd_disp_lock), /* continue */ ); |
| 0 | 425 |
| 426 /* Last, destroy the object */ | |
| 427 free(obj); | |
| 428 } | |
| 429 | |
| 430 /*******************************************************************************************************/ | |
| 431 /*******************************************************************************************************/ | |
| 432 /* */ | |
| 433 /* Compare functions */ | |
| 434 /* */ | |
| 435 /*******************************************************************************************************/ | |
| 436 /*******************************************************************************************************/ | |
| 437 | |
| 438 /* Compare two values */ | |
| 439 #define ORDER_scalar( i1, i2 ) \ | |
| 440 ((i1 < i2 ) ? -1 : ( i1 > i2 ? 1 : 0 )) | |
| 441 | |
| 442 | |
| 443 /* Compare two vendor objects by their id (checks already performed) */ | |
| 444 static int order_vendor_by_id ( struct dict_object *o1, struct dict_object *o2 ) | |
| 445 { | |
| 446 TRACE_ENTRY("%p %p", o1, o2); | |
| 447 | |
| 448 return ORDER_scalar( o1->data.vendor.vendor_id, o2->data.vendor.vendor_id ); | |
| 449 } | |
| 450 | |
| 451 /* Compare two application objects by their id (checks already performed) */ | |
| 452 static int order_appli_by_id ( struct dict_object *o1, struct dict_object *o2 ) | |
| 453 { | |
| 454 TRACE_ENTRY("%p %p", o1, o2); | |
| 455 | |
| 456 return ORDER_scalar( o1->data.application.application_id, o2->data.application.application_id ); | |
| 457 } | |
| 458 | |
| 459 /* Compare two type objects by their name (checks already performed) */ | |
| 460 static int order_type_by_name ( struct dict_object *o1, struct dict_object *o2 ) | |
| 461 { | |
| 462 TRACE_ENTRY("%p %p", o1, o2); | |
| 463 | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
464 return fd_os_cmp( o1->data.type.type_name, o1->datastr_len, o2->data.type.type_name, o2->datastr_len ); |
| 0 | 465 } |
| 466 | |
| 467 /* Compare two type_enum objects by their names (checks already performed) */ | |
| 468 static int order_enum_by_name ( struct dict_object *o1, struct dict_object *o2 ) | |
| 469 { | |
| 470 TRACE_ENTRY("%p %p", o1, o2); | |
| 471 | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
472 return fd_os_cmp( o1->data.enumval.enum_name, o1->datastr_len, o2->data.enumval.enum_name, o2->datastr_len ); |
| 0 | 473 } |
| 474 | |
| 475 /* Compare two type_enum objects by their values (checks already performed) */ | |
| 476 static int order_enum_by_val ( struct dict_object *o1, struct dict_object *o2 ) | |
| 477 { | |
| 478 TRACE_ENTRY("%p %p", o1, o2); | |
| 479 | |
| 480 /* The comparison function depends on the type of data */ | |
| 481 switch ( o1->parent->data.type.type_base ) { | |
| 482 case AVP_TYPE_OCTETSTRING: | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
483 return fd_os_cmp( o1->data.enumval.enum_value.os.data, o1->data.enumval.enum_value.os.len, |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
484 o2->data.enumval.enum_value.os.data, o2->data.enumval.enum_value.os.len); |
| 0 | 485 |
| 486 case AVP_TYPE_INTEGER32: | |
| 487 return ORDER_scalar( o1->data.enumval.enum_value.i32, o2->data.enumval.enum_value.i32 ); | |
| 488 | |
| 489 case AVP_TYPE_INTEGER64: | |
| 490 return ORDER_scalar( o1->data.enumval.enum_value.i64, o2->data.enumval.enum_value.i64 ); | |
| 491 | |
| 492 case AVP_TYPE_UNSIGNED32: | |
| 493 return ORDER_scalar( o1->data.enumval.enum_value.u32, o2->data.enumval.enum_value.u32 ); | |
| 494 | |
| 495 case AVP_TYPE_UNSIGNED64: | |
| 496 return ORDER_scalar( o1->data.enumval.enum_value.u64, o2->data.enumval.enum_value.u64 ); | |
| 497 | |
| 498 case AVP_TYPE_FLOAT32: | |
| 499 return ORDER_scalar( o1->data.enumval.enum_value.f32, o2->data.enumval.enum_value.f32 ); | |
| 500 | |
| 501 case AVP_TYPE_FLOAT64: | |
| 502 return ORDER_scalar( o1->data.enumval.enum_value.f64, o2->data.enumval.enum_value.f64 ); | |
| 503 | |
| 504 case AVP_TYPE_GROUPED: | |
| 505 default: | |
| 506 ASSERT(0); | |
| 507 } | |
| 508 return 0; | |
| 509 } | |
| 510 | |
| 511 /* Compare two avp objects by their codes (checks already performed) */ | |
| 512 static int order_avp_by_code ( struct dict_object *o1, struct dict_object *o2 ) | |
| 513 { | |
| 514 TRACE_ENTRY("%p %p", o1, o2); | |
| 515 | |
| 516 return ORDER_scalar( o1->data.avp.avp_code, o2->data.avp.avp_code ); | |
| 517 } | |
| 518 | |
| 519 /* Compare two avp objects by their names (checks already performed) */ | |
| 520 static int order_avp_by_name ( struct dict_object *o1, struct dict_object *o2 ) | |
| 521 { | |
| 522 TRACE_ENTRY("%p %p", o1, o2); | |
| 523 | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
524 return fd_os_cmp( o1->data.avp.avp_name, o1->datastr_len, o2->data.avp.avp_name, o2->datastr_len ); |
| 0 | 525 } |
| 526 | |
| 527 /* Compare two command objects by their names (checks already performed) */ | |
| 528 static int order_cmd_by_name ( struct dict_object *o1, struct dict_object *o2 ) | |
| 529 { | |
| 530 TRACE_ENTRY("%p %p", o1, o2); | |
| 531 | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
532 return fd_os_cmp( o1->data.cmd.cmd_name, o1->datastr_len, o2->data.cmd.cmd_name, o2->datastr_len ); |
| 0 | 533 } |
| 534 | |
| 535 /* Compare two command objects by their codes and flags (request or answer) (checks already performed) */ | |
| 536 static int order_cmd_by_codefl( struct dict_object *o1, struct dict_object *o2 ) | |
| 537 { | |
| 538 uint8_t fl1, fl2; | |
| 539 int cmp = 0; | |
| 540 | |
| 541 TRACE_ENTRY("%p %p", o1, o2); | |
| 542 | |
| 543 cmp = ORDER_scalar( o1->data.cmd.cmd_code, o2->data.cmd.cmd_code ); | |
| 544 if (cmp) | |
| 545 return cmp; | |
| 546 | |
| 547 /* Same command code, we must compare the value of the 'R' flag */ | |
| 548 fl1 = o1->data.cmd.cmd_flag_val & CMD_FLAG_REQUEST; | |
| 549 fl2 = o2->data.cmd.cmd_flag_val & CMD_FLAG_REQUEST; | |
| 550 | |
| 551 /* We want requests first, so we reverse the operators here */ | |
| 552 return ORDER_scalar(fl2, fl1); | |
| 553 | |
| 554 } | |
| 555 | |
|
658
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
556 /* Compare two rule object by the AVP vendor & code that they refer (checks already performed) */ |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
557 static int order_rule_by_avpvc ( struct dict_object *o1, struct dict_object *o2 ) |
| 0 | 558 { |
| 559 TRACE_ENTRY("%p %p", o1, o2); | |
| 560 | |
|
658
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
561 return ORDER_scalar(o1->data.rule.rule_avp->data.avp.avp_vendor, o2->data.rule.rule_avp->data.avp.avp_vendor) |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
562 ?: ORDER_scalar(o1->data.rule.rule_avp->data.avp.avp_code, o2->data.rule.rule_avp->data.avp.avp_code) ; |
| 0 | 563 } |
| 564 | |
| 565 /*******************************************************************************************************/ | |
| 566 /*******************************************************************************************************/ | |
| 567 /* */ | |
| 568 /* Search functions */ | |
| 569 /* */ | |
| 570 /*******************************************************************************************************/ | |
| 571 /*******************************************************************************************************/ | |
| 572 | |
| 573 /* Functions used to search for objects in the lists, according to some criteria */ | |
| 574 | |
| 575 /* On a general note, if result is not NULL, ENOENT is not returned but *result is NULL. */ | |
| 576 | |
| 577 /* The following macros assume that "what", "ret", "result" (variables), and "end" (label) exist | |
| 578 in the local context where they are called. They are meant to be called only from the functions that follow. */ | |
| 579 | |
| 580 /* For searchs of type "xxx_OF_xxx": children's parent or default parent */ | |
| 581 #define SEARCH_childs_parent( type_of_child, default_parent ) { \ | |
| 582 struct dict_object *__child = (struct dict_object *) what; \ | |
| 583 CHECK_PARAMS_DO( verify_object(__child) && \ | |
| 584 (__child->type == (type_of_child)), \ | |
| 585 { ret = EINVAL; goto end; } ); \ | |
| 586 ret = 0; \ | |
| 587 if (result) \ | |
| 588 *result = (__child->parent ? __child->parent :(default_parent));\ | |
| 589 } | |
| 590 | |
| 591 /* For search of strings in lists. isindex= 1 if the string is the ordering key of the list */ | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
592 /* it is expected that object->datastr_len is the length of the datafield parameter */ |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
593 #define SEARCH_os0_l( str, len, sentinel, datafield, isindex ) { \ |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
594 char * __str = (char *) (str); \ |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
595 size_t __strlen = (size_t)(len); \ |
| 0 | 596 int __cmp; \ |
| 597 struct fd_list * __li; \ | |
| 598 ret = 0; \ | |
|
602
0b5d21c87855
Added new AVP search criteria in the dictionary: AVP_BY_NAME_ALL_VENDORS
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
446
diff
changeset
|
599 for (__li = (sentinel)->next; __li != (sentinel); __li = __li->next) { \ |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
600 __cmp = fd_os_cmp(__str, __strlen, \ |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
601 _O(__li->o)->data. datafield, _O(__li->o)->datastr_len);\ |
| 0 | 602 if (__cmp == 0) { \ |
| 603 if (result) \ | |
|
602
0b5d21c87855
Added new AVP search criteria in the dictionary: AVP_BY_NAME_ALL_VENDORS
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
446
diff
changeset
|
604 *result = _O(__li->o); \ |
| 0 | 605 goto end; \ |
| 606 } \ | |
| 607 if ((isindex) && (__cmp < 0)) \ | |
| 608 break; \ | |
| 609 } \ | |
| 610 if (result) \ | |
| 611 *result = NULL; \ | |
| 612 else \ | |
| 613 ret = ENOENT; \ | |
| 614 } | |
| 615 | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
616 /* When len is not provided */ |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
617 #define SEARCH_os0( str, sentinel, datafield, isindex ) { \ |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
618 char * _str = (char *) (str); \ |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
619 size_t _strlen = strlen(_str); \ |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
620 SEARCH_os0_l( _str, _strlen, sentinel, datafield, isindex ); \ |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
621 } |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
622 |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
623 |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
624 /* For search of octetstrings in lists. */ |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
625 #define SEARCH_os( str, strlen, sentinel, osdatafield, isindex ) { \ |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
626 uint8_t * __str = (uint8_t *) (str); \ |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
627 size_t __strlen = (size_t)(strlen); \ |
| 0 | 628 int __cmp; \ |
| 629 struct fd_list * __li; \ | |
| 630 ret = 0; \ | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
631 for (__li = (sentinel)->next; __li != (sentinel); __li = __li->next) { \ |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
632 __cmp = fd_os_cmp(__str, __strlen, \ |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
633 _O(__li->o)->data. osdatafield .data, \ |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
634 _O(__li->o)->data. osdatafield .len); \ |
| 0 | 635 if (__cmp == 0) { \ |
| 636 if (result) \ | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
637 *result = _O(__li->o); \ |
| 0 | 638 goto end; \ |
| 639 } \ | |
| 640 if ((isindex) && (__cmp < 0)) \ | |
| 641 break; \ | |
| 642 } \ | |
| 643 if (result) \ | |
| 644 *result = NULL; \ | |
| 645 else \ | |
| 646 ret = ENOENT; \ | |
| 647 } | |
| 648 | |
|
910
8500947421cb
Fix bug in fd_dict_search for rules. Thank you Thomas for bug & fix.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
907
diff
changeset
|
649 /* For search of AVP name in rule lists -- the list is not ordered by AVP names! */ |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
650 #define SEARCH_ruleavpname( str, strlen, sentinel ) { \ |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
651 char * __str = (char *) (str); \ |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
652 size_t __strlen = (size_t) (strlen); \ |
| 0 | 653 int __cmp; \ |
| 654 struct fd_list * __li; \ | |
| 655 ret = 0; \ | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
656 for (__li = (sentinel)->next; __li != (sentinel); __li = __li->next) { \ |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
657 __cmp = fd_os_cmp(__str, __strlen, \ |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
658 _O(__li->o)->data.rule.rule_avp->data.avp.avp_name, \ |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
659 _O(__li->o)->data.rule.rule_avp->datastr_len); \ |
| 0 | 660 if (__cmp == 0) { \ |
| 661 if (result) \ | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
662 *result = _O(__li->o); \ |
| 0 | 663 goto end; \ |
| 664 } \ | |
| 665 } \ | |
| 666 if (result) \ | |
| 667 *result = NULL; \ | |
| 668 else \ | |
| 669 ret = ENOENT; \ | |
| 670 } | |
| 671 | |
| 672 /* For search of scalars in lists. isindex= 1 if the value is the ordering key of the list */ | |
| 673 #define SEARCH_scalar( value, sentinel, datafield, isindex, defaultobj ) { \ | |
| 674 int __cmp; \ | |
| 675 struct fd_list * __li; \ | |
| 676 ret = 0; \ | |
| 677 if ( ((defaultobj) != NULL) \ | |
| 678 && (_O(defaultobj)->data. datafield == value)) { \ | |
| 679 if (result) \ | |
| 680 *result = _O(defaultobj); \ | |
| 681 goto end; \ | |
| 682 } \ | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
683 for (__li = (sentinel)->next; __li != (sentinel); __li = __li->next) { \ |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
684 __cmp= ORDER_scalar(value, _O(__li->o)->data. datafield ); \ |
| 0 | 685 if (__cmp == 0) { \ |
| 686 if (result) \ | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
687 *result = _O(__li->o); \ |
| 0 | 688 goto end; \ |
| 689 } \ | |
| 690 if ((isindex) && (__cmp < 0)) \ | |
| 691 break; \ | |
| 692 } \ | |
| 693 if (result) \ | |
| 694 *result = NULL; \ | |
| 695 else \ | |
| 696 ret = ENOENT; \ | |
| 697 } | |
| 698 | |
| 699 /* For search of commands in lists by code and flag. R_flag_val = 0 or CMD_FLAG_REQUEST */ | |
| 700 #define SEARCH_codefl( value, R_flag_val, sentinel) { \ | |
| 701 int __cmp; \ | |
| 702 struct fd_list * __li; \ | |
| 703 ret = 0; \ | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
704 for (__li = (sentinel)->next; __li != (sentinel); __li = __li->next) { \ |
| 0 | 705 __cmp = ORDER_scalar(value, \ |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
706 _O(__li->o)->data.cmd.cmd_code ); \ |
| 0 | 707 if (__cmp == 0) { \ |
| 708 uint8_t __mask, __val; \ | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
709 __mask = _O(__li->o)->data.cmd.cmd_flag_mask; \ |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
710 __val = _O(__li->o)->data.cmd.cmd_flag_val; \ |
| 0 | 711 if ( ! (__mask & CMD_FLAG_REQUEST) ) \ |
| 712 continue; \ | |
| 713 if ( ( __val & CMD_FLAG_REQUEST ) != R_flag_val ) \ | |
| 714 continue; \ | |
| 715 if (result) \ | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
716 *result = _O(__li->o); \ |
| 0 | 717 goto end; \ |
| 718 } \ | |
| 719 if (__cmp < 0) \ | |
| 720 break; \ | |
| 721 } \ | |
| 722 if (result) \ | |
| 723 *result = NULL; \ | |
| 724 else \ | |
| 725 ret = ENOENT; \ | |
| 726 } | |
| 727 | |
|
1093
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
728 /* For searchs of type "xxx_OF_xxx": if the search object is sentinel list for the "what" object */ |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
729 #define SEARCH_sentinel( type_of_what, what_list_nr, sentinel_list_nr ) { \ |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
730 struct dict_object *__what = (struct dict_object *) what; \ |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
731 CHECK_PARAMS_DO( verify_object(__what) && \ |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
732 (__what->type == (type_of_what)), \ |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
733 { ret = EINVAL; goto end; } ); \ |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
734 ret = 0; \ |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
735 if (result) { \ |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
736 /* this is similar to the "container_of" */ \ |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
737 *result = (struct dict_object *)((char *)(__what->list[what_list_nr].head) - \ |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
738 (size_t)&(((struct dict_object *)0)->list[sentinel_list_nr])); \ |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
739 } \ |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
740 } |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
741 |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
742 |
|
907
b772af200865
Add a few const declaration so that C++ is less picky
Sebastien Decugis <sdecugis@freediameter.net>
parents:
906
diff
changeset
|
743 static int search_vendor ( struct dictionary * dict, int criteria, const void * what, struct dict_object **result ) |
| 0 | 744 { |
| 745 int ret = 0; | |
| 746 vendor_id_t id; | |
| 747 | |
| 748 TRACE_ENTRY("%p %d %p %p", dict, criteria, what, result); | |
| 749 | |
| 750 switch (criteria) { | |
| 751 case VENDOR_BY_ID: | |
| 752 id = *(vendor_id_t *) what; | |
| 753 SEARCH_scalar( id, &dict->dict_vendors.list[0], vendor.vendor_id, 1, &dict->dict_vendors ); | |
| 754 break; | |
| 755 | |
| 756 case VENDOR_BY_NAME: | |
| 757 /* "what" is a vendor name */ | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
758 SEARCH_os0( what, &dict->dict_vendors.list[0], vendor.vendor_name, 0); |
| 0 | 759 break; |
| 760 | |
| 761 case VENDOR_OF_APPLICATION: | |
| 762 /* "what" should be an application object */ | |
| 763 SEARCH_childs_parent( DICT_APPLICATION, &dict->dict_vendors ); | |
| 764 break; | |
| 765 | |
|
1093
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
766 case VENDOR_OF_AVP: |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
767 /* "what" should be an avp object */ |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
768 SEARCH_sentinel( DICT_AVP, 0, 1 ); |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
769 break; |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
770 |
| 0 | 771 default: |
| 772 /* Invalid criteria */ | |
| 773 CHECK_PARAMS( criteria = 0 ); | |
| 774 } | |
| 775 end: | |
| 776 return ret; | |
| 777 } | |
| 778 | |
|
907
b772af200865
Add a few const declaration so that C++ is less picky
Sebastien Decugis <sdecugis@freediameter.net>
parents:
906
diff
changeset
|
779 static int search_application ( struct dictionary * dict, int criteria, const void * what, struct dict_object **result ) |
| 0 | 780 { |
| 781 int ret = 0; | |
| 782 application_id_t id; | |
| 783 | |
| 784 TRACE_ENTRY("%p %d %p %p", dict, criteria, what, result); | |
| 785 | |
| 786 switch (criteria) { | |
| 787 case APPLICATION_BY_ID: | |
| 788 id = *(application_id_t *) what; | |
| 789 | |
| 790 SEARCH_scalar( id, &dict->dict_applications.list[0], application.application_id, 1, &dict->dict_applications ); | |
| 791 break; | |
| 792 | |
| 793 case APPLICATION_BY_NAME: | |
| 794 /* "what" is an application name */ | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
795 SEARCH_os0( what, &dict->dict_applications.list[0], application.application_name, 0); |
| 0 | 796 break; |
| 797 | |
| 798 case APPLICATION_OF_TYPE: | |
| 799 /* "what" should be a type object */ | |
| 800 SEARCH_childs_parent( DICT_TYPE, &dict->dict_applications ); | |
| 801 break; | |
| 802 | |
| 803 case APPLICATION_OF_COMMAND: | |
| 804 /* "what" should be a command object */ | |
| 805 SEARCH_childs_parent( DICT_COMMAND, &dict->dict_applications ); | |
| 806 break; | |
| 807 | |
| 808 default: | |
| 809 /* Invalid criteria */ | |
| 810 CHECK_PARAMS( criteria = 0 ); | |
| 811 } | |
| 812 end: | |
| 813 return ret; | |
| 814 } | |
| 815 | |
|
907
b772af200865
Add a few const declaration so that C++ is less picky
Sebastien Decugis <sdecugis@freediameter.net>
parents:
906
diff
changeset
|
816 static int search_type ( struct dictionary * dict, int criteria, const void * what, struct dict_object **result ) |
| 0 | 817 { |
| 818 int ret = 0; | |
| 819 | |
| 820 TRACE_ENTRY("%p %d %p %p", dict, criteria, what, result); | |
| 821 | |
| 822 switch (criteria) { | |
| 823 case TYPE_BY_NAME: | |
| 824 /* "what" is a type name */ | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
825 SEARCH_os0( what, &dict->dict_types, type.type_name, 1); |
| 0 | 826 break; |
| 827 | |
| 828 case TYPE_OF_ENUMVAL: | |
| 829 /* "what" should be a type_enum object */ | |
| 830 SEARCH_childs_parent( DICT_ENUMVAL, NULL ); | |
| 831 break; | |
| 832 | |
| 833 case TYPE_OF_AVP: | |
| 834 /* "what" should be an avp object */ | |
| 835 SEARCH_childs_parent( DICT_AVP, NULL ); | |
| 836 break; | |
| 837 | |
| 838 | |
| 839 default: | |
| 840 /* Invalid criteria */ | |
| 841 CHECK_PARAMS( criteria = 0 ); | |
| 842 } | |
| 843 end: | |
| 844 return ret; | |
| 845 } | |
| 846 | |
|
907
b772af200865
Add a few const declaration so that C++ is less picky
Sebastien Decugis <sdecugis@freediameter.net>
parents:
906
diff
changeset
|
847 static int search_enumval ( struct dictionary * dict, int criteria, const void * what, struct dict_object **result ) |
| 0 | 848 { |
| 849 int ret = 0; | |
| 850 | |
| 851 TRACE_ENTRY("%p %d %p %p", dict, criteria, what, result); | |
| 852 | |
| 853 switch (criteria) { | |
| 854 case ENUMVAL_BY_STRUCT: | |
| 855 { | |
| 856 struct dict_object * parent = NULL; | |
| 857 struct dict_enumval_request * _what = (struct dict_enumval_request *) what; | |
| 858 | |
| 859 CHECK_PARAMS( _what && ( _what->type_obj || _what->type_name ) ); | |
| 860 | |
| 861 if (_what->type_obj != NULL) { | |
| 862 parent = _what->type_obj; | |
| 863 CHECK_PARAMS( verify_object(parent) && (parent->type == DICT_TYPE) ); | |
| 864 } else { | |
| 865 /* We received only the type name, we must find it first */ | |
| 866 CHECK_FCT_DO( search_type( dict, TYPE_BY_NAME, _what->type_name, &parent ), | |
| 867 CHECK_PARAMS( 0 ) ); | |
| 868 } | |
| 869 | |
| 870 /* From here the "parent" object is valid */ | |
| 871 | |
| 872 if ( _what->search.enum_name != NULL ) { | |
| 873 /* We are looking for this string */ | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
874 SEARCH_os0( _what->search.enum_name, &parent->list[1], enumval.enum_name, 1 ); |
| 0 | 875 } else { |
| 876 /* We are looking for the value in enum_value */ | |
| 877 switch (parent->data.type.type_base) { | |
| 878 case AVP_TYPE_OCTETSTRING: | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
879 SEARCH_os( _what->search.enum_value.os.data, |
| 0 | 880 _what->search.enum_value.os.len, |
| 881 &parent->list[2], | |
| 882 enumval.enum_value.os , | |
| 883 1 ); | |
| 884 break; | |
| 885 | |
| 886 case AVP_TYPE_INTEGER32: | |
| 887 SEARCH_scalar( _what->search.enum_value.i32, | |
| 888 &parent->list[2], | |
| 889 enumval.enum_value.i32, | |
| 890 1, | |
| 891 (struct dict_object *)NULL); | |
| 892 break; | |
| 893 | |
| 894 case AVP_TYPE_INTEGER64: | |
| 895 SEARCH_scalar( _what->search.enum_value.i64, | |
| 896 &parent->list[2], | |
| 897 enumval.enum_value.i64, | |
| 898 1, | |
| 899 (struct dict_object *)NULL); | |
| 900 break; | |
| 901 | |
| 902 case AVP_TYPE_UNSIGNED32: | |
| 903 SEARCH_scalar( _what->search.enum_value.u32, | |
| 904 &parent->list[2], | |
| 905 enumval.enum_value.u32, | |
| 906 1, | |
| 907 (struct dict_object *)NULL); | |
| 908 break; | |
| 909 | |
| 910 case AVP_TYPE_UNSIGNED64: | |
| 911 SEARCH_scalar( _what->search.enum_value.u64, | |
| 912 &parent->list[2], | |
| 913 enumval.enum_value.u64, | |
| 914 1, | |
| 915 (struct dict_object *)NULL); | |
| 916 break; | |
| 917 | |
| 918 case AVP_TYPE_FLOAT32: | |
| 919 SEARCH_scalar( _what->search.enum_value.f32, | |
| 920 &parent->list[2], | |
| 921 enumval.enum_value.f32, | |
| 922 1, | |
| 923 (struct dict_object *)NULL); | |
| 924 break; | |
| 925 | |
| 926 case AVP_TYPE_FLOAT64: | |
| 927 SEARCH_scalar( _what->search.enum_value.f64, | |
| 928 &parent->list[2], | |
| 929 enumval.enum_value.f64, | |
| 930 1, | |
| 931 (struct dict_object *)NULL); | |
| 932 break; | |
| 933 | |
| 934 default: | |
| 935 /* Invalid parent type basetype */ | |
| 936 CHECK_PARAMS( parent = NULL ); | |
| 937 } | |
| 938 } | |
| 939 | |
| 940 } | |
| 941 break; | |
| 942 | |
| 943 | |
| 944 default: | |
| 945 /* Invalid criteria */ | |
| 946 CHECK_PARAMS( criteria = 0 ); | |
| 947 } | |
| 948 end: | |
| 949 return ret; | |
| 950 } | |
| 951 | |
|
907
b772af200865
Add a few const declaration so that C++ is less picky
Sebastien Decugis <sdecugis@freediameter.net>
parents:
906
diff
changeset
|
952 static int search_avp ( struct dictionary * dict, int criteria, const void * what, struct dict_object **result ) |
| 0 | 953 { |
| 954 int ret = 0; | |
| 955 | |
| 956 TRACE_ENTRY("%p %d %p %p", dict, criteria, what, result); | |
| 957 | |
| 958 switch (criteria) { | |
| 959 case AVP_BY_CODE: | |
| 960 { | |
| 961 avp_code_t code; | |
| 962 code = *(avp_code_t *) what; | |
| 963 | |
| 964 SEARCH_scalar( code, &dict->dict_vendors.list[1], avp.avp_code, 1, (struct dict_object *)NULL ); | |
| 965 } | |
| 966 break; | |
| 967 | |
| 968 case AVP_BY_NAME: | |
| 969 /* "what" is the AVP name, vendor 0 */ | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
970 SEARCH_os0( what, &dict->dict_vendors.list[2], avp.avp_name, 1); |
| 0 | 971 break; |
| 972 | |
| 973 case AVP_BY_CODE_AND_VENDOR: | |
| 974 case AVP_BY_NAME_AND_VENDOR: | |
| 975 { | |
| 976 struct dict_avp_request * _what = (struct dict_avp_request *) what; | |
| 977 struct dict_object * vendor = NULL; | |
| 978 | |
| 979 CHECK_PARAMS( (criteria != AVP_BY_NAME_AND_VENDOR) || _what->avp_name ); | |
| 980 | |
| 981 /* Now look for the vendor first */ | |
| 982 CHECK_FCT( search_vendor( dict, VENDOR_BY_ID, &_what->avp_vendor, &vendor ) ); | |
| 983 if (vendor == NULL) { | |
| 984 if (result) | |
| 985 *result = NULL; | |
| 986 else | |
| 987 ret = ENOENT; | |
| 988 goto end; | |
| 989 } | |
| 990 | |
| 991 /* We now have our vendor = head of the appropriate avp list */ | |
| 992 if (criteria == AVP_BY_NAME_AND_VENDOR) { | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
993 SEARCH_os0( _what->avp_name, &vendor->list[2], avp.avp_name, 1); |
| 0 | 994 } else { |
| 995 /* AVP_BY_CODE_AND_VENDOR */ | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
996 SEARCH_scalar( _what->avp_code, &vendor->list[1], avp.avp_code, 1, (struct dict_object *)NULL ); |
| 0 | 997 } |
| 998 } | |
| 999 break; | |
| 1000 | |
|
903
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1001 case AVP_BY_STRUCT: |
|
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1002 { |
|
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1003 struct dict_avp_request_ex * _what = (struct dict_avp_request_ex *) what; |
|
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1004 struct dict_object * vendor = NULL; |
|
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1005 |
|
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1006 CHECK_PARAMS( _what->avp_vendor.vendor || _what->avp_vendor.vendor_id || _what->avp_vendor.vendor_name ); |
|
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1007 CHECK_PARAMS( _what->avp_data.avp_code || _what->avp_data.avp_name ); |
|
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1008 |
|
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1009 /* Now look for the vendor first */ |
|
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1010 if (_what->avp_vendor.vendor) { |
|
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1011 CHECK_PARAMS( ! _what->avp_vendor.vendor_id && ! _what->avp_vendor.vendor_name ); |
|
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1012 vendor = _what->avp_vendor.vendor; |
|
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1013 } else if (_what->avp_vendor.vendor_id) { |
|
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1014 CHECK_PARAMS( ! _what->avp_vendor.vendor_name ); |
|
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1015 CHECK_FCT( search_vendor( dict, VENDOR_BY_ID, &_what->avp_vendor.vendor_id, &vendor ) ); |
|
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1016 } else { |
|
906
ebe479bfcd4b
Fix typo in new code
Sebastien Decugis <sdecugis@freediameter.net>
parents:
903
diff
changeset
|
1017 CHECK_FCT( search_vendor( dict, VENDOR_BY_NAME, _what->avp_vendor.vendor_name, &vendor ) ); |
|
903
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1018 } |
|
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1019 |
|
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1020 if (vendor == NULL) { |
|
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1021 if (result) |
|
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1022 *result = NULL; |
|
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1023 else |
|
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1024 ret = ENOENT; |
|
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1025 goto end; |
|
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1026 } |
|
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1027 |
|
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1028 /* We now have our vendor = head of the appropriate avp list */ |
|
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1029 if (_what->avp_data.avp_code) { |
|
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1030 CHECK_PARAMS( ! _what->avp_data.avp_name ); |
|
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1031 SEARCH_scalar( _what->avp_data.avp_code, &vendor->list[1], avp.avp_code, 1, (struct dict_object *)NULL ); |
|
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1032 } else { |
|
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1033 SEARCH_os0( _what->avp_data.avp_name, &vendor->list[2], avp.avp_name, 1); |
|
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1034 } |
|
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1035 } |
|
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1036 break; |
|
4382d7420e65
Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
834
diff
changeset
|
1037 |
|
602
0b5d21c87855
Added new AVP search criteria in the dictionary: AVP_BY_NAME_ALL_VENDORS
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
446
diff
changeset
|
1038 case AVP_BY_NAME_ALL_VENDORS: |
|
0b5d21c87855
Added new AVP search criteria in the dictionary: AVP_BY_NAME_ALL_VENDORS
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
446
diff
changeset
|
1039 { |
|
0b5d21c87855
Added new AVP search criteria in the dictionary: AVP_BY_NAME_ALL_VENDORS
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
446
diff
changeset
|
1040 struct fd_list * li; |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
1041 size_t wl = strlen((char *)what); |
|
602
0b5d21c87855
Added new AVP search criteria in the dictionary: AVP_BY_NAME_ALL_VENDORS
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
446
diff
changeset
|
1042 |
|
0b5d21c87855
Added new AVP search criteria in the dictionary: AVP_BY_NAME_ALL_VENDORS
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
446
diff
changeset
|
1043 /* First, search for vendor 0 */ |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
1044 SEARCH_os0_l( what, wl, &dict->dict_vendors.list[2], avp.avp_name, 1); |
|
602
0b5d21c87855
Added new AVP search criteria in the dictionary: AVP_BY_NAME_ALL_VENDORS
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
446
diff
changeset
|
1045 |
|
0b5d21c87855
Added new AVP search criteria in the dictionary: AVP_BY_NAME_ALL_VENDORS
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
446
diff
changeset
|
1046 /* If not found, loop for all vendors, until found */ |
|
0b5d21c87855
Added new AVP search criteria in the dictionary: AVP_BY_NAME_ALL_VENDORS
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
446
diff
changeset
|
1047 for (li = dict->dict_vendors.list[0].next; li != &dict->dict_vendors.list[0]; li = li->next) { |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
1048 SEARCH_os0_l( what, wl, &_O(li->o)->list[2], avp.avp_name, 1); |
|
602
0b5d21c87855
Added new AVP search criteria in the dictionary: AVP_BY_NAME_ALL_VENDORS
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
446
diff
changeset
|
1049 } |
|
0b5d21c87855
Added new AVP search criteria in the dictionary: AVP_BY_NAME_ALL_VENDORS
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
446
diff
changeset
|
1050 } |
|
0b5d21c87855
Added new AVP search criteria in the dictionary: AVP_BY_NAME_ALL_VENDORS
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
446
diff
changeset
|
1051 break; |
|
0b5d21c87855
Added new AVP search criteria in the dictionary: AVP_BY_NAME_ALL_VENDORS
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
446
diff
changeset
|
1052 |
| 0 | 1053 default: |
| 1054 /* Invalid criteria */ | |
| 1055 CHECK_PARAMS( criteria = 0 ); | |
| 1056 } | |
| 1057 end: | |
| 1058 return ret; | |
| 1059 } | |
| 1060 | |
|
907
b772af200865
Add a few const declaration so that C++ is less picky
Sebastien Decugis <sdecugis@freediameter.net>
parents:
906
diff
changeset
|
1061 static int search_cmd ( struct dictionary * dict, int criteria, const void * what, struct dict_object **result ) |
| 0 | 1062 { |
| 1063 int ret = 0; | |
| 1064 | |
| 1065 TRACE_ENTRY("%p %d %p %p", dict, criteria, what, result); | |
| 1066 | |
| 1067 switch (criteria) { | |
| 1068 case CMD_BY_NAME: | |
| 1069 /* "what" is a command name */ | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
1070 SEARCH_os0( what, &dict->dict_cmd_name, cmd.cmd_name, 1); |
| 0 | 1071 break; |
| 1072 | |
| 1073 case CMD_BY_CODE_R: | |
| 1074 case CMD_BY_CODE_A: | |
| 1075 { | |
| 1076 command_code_t code; | |
| 1077 uint8_t searchfl = 0; | |
| 1078 | |
| 1079 /* The command code that we are searching */ | |
| 1080 code = *(command_code_t *) what; | |
| 1081 | |
| 1082 /* The flag (request or answer) of the command we are searching */ | |
| 1083 if (criteria == CMD_BY_CODE_R) { | |
| 1084 searchfl = CMD_FLAG_REQUEST; | |
| 1085 } | |
| 1086 | |
| 1087 /* perform the search */ | |
| 1088 SEARCH_codefl( code, searchfl, &dict->dict_cmd_code ); | |
| 1089 } | |
| 1090 break; | |
| 1091 | |
| 1092 case CMD_ANSWER: | |
| 1093 { | |
| 1094 /* "what" is a command object of type "request" */ | |
| 1095 struct dict_object * req = (struct dict_object *) what; | |
| 1096 struct dict_object * ans = NULL; | |
| 1097 | |
| 1098 CHECK_PARAMS( verify_object(req) | |
| 1099 && (req->type == DICT_COMMAND) | |
| 1100 && (req->data.cmd.cmd_flag_mask & CMD_FLAG_REQUEST) | |
| 1101 && (req->data.cmd.cmd_flag_val & CMD_FLAG_REQUEST) ); | |
| 1102 | |
| 1103 /* The answer is supposed to be the next element in the list, if it exists */ | |
| 1104 ans = req->list[1].next->o; | |
| 1105 if ( ans == NULL ) { | |
| 1106 TRACE_DEBUG( FULL, "the request was the last element in the list" ); | |
| 1107 ret = ENOENT; | |
| 1108 goto end; | |
| 1109 } | |
| 1110 | |
| 1111 /* Now check that the ans element is really the correct one */ | |
| 1112 if ( (ans->data.cmd.cmd_code != req->data.cmd.cmd_code) | |
| 1113 || (!(ans->data.cmd.cmd_flag_mask & CMD_FLAG_REQUEST)) | |
| 1114 || ( ans->data.cmd.cmd_flag_val & CMD_FLAG_REQUEST ) ) { | |
| 1115 TRACE_DEBUG( FULL, "the answer does not follow the request in the list" ); | |
| 1116 ret = ENOENT; | |
| 1117 goto end; | |
| 1118 } | |
| 1119 | |
| 1120 if (result) | |
| 1121 *result = ans; | |
| 1122 ret = 0; | |
| 1123 } | |
| 1124 break; | |
| 1125 | |
| 1126 default: | |
| 1127 /* Invalid criteria */ | |
| 1128 CHECK_PARAMS( criteria = 0 ); | |
| 1129 } | |
| 1130 end: | |
| 1131 return ret; | |
| 1132 } | |
| 1133 | |
|
907
b772af200865
Add a few const declaration so that C++ is less picky
Sebastien Decugis <sdecugis@freediameter.net>
parents:
906
diff
changeset
|
1134 static int search_rule ( struct dictionary * dict, int criteria, const void * what, struct dict_object **result ) |
| 0 | 1135 { |
| 1136 int ret = 0; | |
| 1137 | |
| 1138 TRACE_ENTRY("%p %d %p %p", dict, criteria, what, result); | |
| 1139 | |
| 1140 switch (criteria) { | |
| 1141 case RULE_BY_AVP_AND_PARENT: | |
| 1142 { | |
| 1143 struct dict_object * parent = NULL; | |
| 1144 struct dict_object * avp = NULL; | |
| 1145 struct dict_rule_request * _what = (struct dict_rule_request *) what; | |
| 1146 | |
| 1147 CHECK_PARAMS( _what | |
| 1148 && (parent = _what->rule_parent) | |
| 1149 && (avp = _what->rule_avp ) ); | |
| 1150 | |
| 1151 CHECK_PARAMS( verify_object(parent) | |
| 1152 && ((parent->type == DICT_COMMAND) | |
| 1153 || ((parent->type == DICT_AVP) && (parent->data.avp.avp_basetype == AVP_TYPE_GROUPED))) ); | |
| 1154 | |
| 1155 CHECK_PARAMS( verify_object(avp) && (avp->type == DICT_AVP) ); | |
| 1156 | |
| 1157 /* Perform the search */ | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
1158 SEARCH_ruleavpname( avp->data.avp.avp_name, avp->datastr_len, &parent->list[2]); |
| 0 | 1159 |
| 1160 } | |
| 1161 break; | |
| 1162 | |
| 1163 default: | |
| 1164 /* Invalid criteria */ | |
| 1165 CHECK_PARAMS( criteria = 0 ); | |
| 1166 } | |
| 1167 end: | |
| 1168 return ret; | |
| 1169 } | |
| 1170 | |
| 1171 /*******************************************************************************************************/ | |
| 1172 /*******************************************************************************************************/ | |
| 1173 /* */ | |
| 1174 /* Dump / debug functions */ | |
| 1175 /* */ | |
| 1176 /*******************************************************************************************************/ | |
| 1177 /*******************************************************************************************************/ | |
| 1178 /* The following functions are used to debug the module, and allow to print out the content of the dictionary */ | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1179 static DECLARE_FD_DUMP_PROTOTYPE(dump_vendor_data, void * data ) |
| 0 | 1180 { |
| 1181 struct dict_vendor_data * vendor = (struct dict_vendor_data *)data; | |
| 1182 | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1183 return fd_dump_extend( FD_DUMP_STD_PARAMS, "data: %-6u \"%s\"", vendor->vendor_id, vendor->vendor_name); |
| 0 | 1184 } |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1185 static DECLARE_FD_DUMP_PROTOTYPE(dump_application_data, void * data ) |
| 0 | 1186 { |
| 1187 struct dict_application_data * appli = (struct dict_application_data *) data; | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1188 return fd_dump_extend( FD_DUMP_STD_PARAMS, "data: %-6u \"%s\"", appli->application_id, appli->application_name); |
| 0 | 1189 } |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1190 static DECLARE_FD_DUMP_PROTOTYPE(dump_type_data, void * data ) |
| 0 | 1191 { |
| 1192 struct dict_type_data * type = ( struct dict_type_data * ) data; | |
| 1193 | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1194 return fd_dump_extend( FD_DUMP_STD_PARAMS, "data: %-12s \"%s\"", |
| 0 | 1195 type_base_name[type->type_base], |
| 1196 type->type_name); | |
| 1197 } | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1198 static DECLARE_FD_DUMP_PROTOTYPE(dump_enumval_data, struct dict_enumval_data * enumval, enum dict_avp_basetype type ) |
| 0 | 1199 { |
| 1200 const int LEN_MAX = 20; | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1201 CHECK_MALLOC_DO(fd_dump_extend( FD_DUMP_STD_PARAMS, "data: (%-12s) \"%s\" -> ", type_base_name[type], enumval->enum_name), return NULL); |
| 0 | 1202 switch (type) { |
| 1203 case AVP_TYPE_OCTETSTRING: | |
| 1204 { | |
| 1205 int i, n=LEN_MAX; | |
| 1206 if (enumval->enum_value.os.len < LEN_MAX) | |
| 1207 n = enumval->enum_value.os.len; | |
| 1208 for (i=0; i < n; i++) | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1209 CHECK_MALLOC_DO(fd_dump_extend( FD_DUMP_STD_PARAMS, "0x%2hhX/'%c' ", enumval->enum_value.os.data[i], ASCII(enumval->enum_value.os.data[i])), return NULL); |
| 0 | 1210 if (n == LEN_MAX) |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1211 CHECK_MALLOC_DO(fd_dump_extend( FD_DUMP_STD_PARAMS, "..."), return NULL); |
| 0 | 1212 } |
| 1213 break; | |
| 1214 | |
| 1215 case AVP_TYPE_INTEGER32: | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1216 CHECK_MALLOC_DO(fd_dump_extend( FD_DUMP_STD_PARAMS, "%i", enumval->enum_value.i32), return NULL); |
| 0 | 1217 break; |
| 1218 | |
| 1219 case AVP_TYPE_INTEGER64: | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1220 CHECK_MALLOC_DO(fd_dump_extend( FD_DUMP_STD_PARAMS, "%"PRId64, enumval->enum_value.i64), return NULL); |
| 0 | 1221 break; |
| 1222 | |
| 1223 case AVP_TYPE_UNSIGNED32: | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1224 CHECK_MALLOC_DO(fd_dump_extend( FD_DUMP_STD_PARAMS, "%u", enumval->enum_value.u32), return NULL); |
| 0 | 1225 break; |
| 1226 | |
| 1227 case AVP_TYPE_UNSIGNED64: | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1228 CHECK_MALLOC_DO(fd_dump_extend( FD_DUMP_STD_PARAMS, "%"PRIu64, enumval->enum_value.u64), return NULL); |
| 0 | 1229 break; |
| 1230 | |
| 1231 case AVP_TYPE_FLOAT32: | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1232 CHECK_MALLOC_DO(fd_dump_extend( FD_DUMP_STD_PARAMS, "%f", enumval->enum_value.f32), return NULL); |
| 0 | 1233 break; |
| 1234 | |
| 1235 case AVP_TYPE_FLOAT64: | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1236 CHECK_MALLOC_DO(fd_dump_extend( FD_DUMP_STD_PARAMS, "%g", enumval->enum_value.f64), return NULL); |
| 0 | 1237 break; |
| 1238 | |
| 1239 default: | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1240 CHECK_MALLOC_DO(fd_dump_extend( FD_DUMP_STD_PARAMS, "??? (ERROR unknown type %d)", type), return NULL); |
| 0 | 1241 } |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1242 return *buf; |
| 0 | 1243 } |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1244 static DECLARE_FD_DUMP_PROTOTYPE(dump_avp_data, void * data ) |
| 0 | 1245 { |
| 1246 struct dict_avp_data * avp = (struct dict_avp_data * ) data; | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1247 return fd_dump_extend( FD_DUMP_STD_PARAMS, "data: v/m:" DUMP_AVPFL_str "/" DUMP_AVPFL_str ", %12s, %-6u \"%s\"", |
| 0 | 1248 DUMP_AVPFL_val(avp->avp_flag_val), |
| 1249 DUMP_AVPFL_val(avp->avp_flag_mask), | |
| 1250 type_base_name[avp->avp_basetype], | |
| 1251 avp->avp_code, | |
| 1252 avp->avp_name ); | |
| 1253 } | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1254 static DECLARE_FD_DUMP_PROTOTYPE(dump_command_data, void * data ) |
| 0 | 1255 { |
| 1256 struct dict_cmd_data * cmd = (struct dict_cmd_data *) data; | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1257 return fd_dump_extend( FD_DUMP_STD_PARAMS, "data: v/m:" DUMP_CMDFL_str "/" DUMP_CMDFL_str ", %-6u \"%s\"", |
| 0 | 1258 DUMP_CMDFL_val(cmd->cmd_flag_val), DUMP_CMDFL_val(cmd->cmd_flag_mask), cmd->cmd_code, cmd->cmd_name); |
| 1259 } | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1260 static DECLARE_FD_DUMP_PROTOTYPE(dump_rule_data, void * data ) |
| 0 | 1261 { |
| 1262 struct dict_rule_data * rule = (struct dict_rule_data * )data; | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1263 return fd_dump_extend( FD_DUMP_STD_PARAMS, "data: pos:%d ord:%d m/M:%2d/%2d avp:\"%s\"", |
| 0 | 1264 rule->rule_position, |
| 1265 rule->rule_order, | |
| 1266 rule->rule_min, | |
| 1267 rule->rule_max, | |
| 1268 rule->rule_avp->data.avp.avp_name); | |
| 1269 } | |
| 1270 | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1271 static DECLARE_FD_DUMP_PROTOTYPE(dump_object, struct dict_object * obj, int parents, int depth, int indent ); |
| 0 | 1272 |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1273 static DECLARE_FD_DUMP_PROTOTYPE(dump_list, struct fd_list * sentinel, int parents, int depth, int indent ) |
| 0 | 1274 { |
| 1275 struct fd_list * li = sentinel; | |
| 1276 /* We don't lock here, the caller must have taken the dictionary lock for reading already */ | |
|
1093
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
1277 if (FD_IS_LIST_EMPTY(sentinel)) { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
1278 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n%*s{empty list}", indent, ""), return NULL); |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
1279 } else { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
1280 while (li->next != sentinel) |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
1281 { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
1282 li = li->next; |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
1283 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n"), return NULL); |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
1284 CHECK_MALLOC_DO( dump_object (FD_DUMP_STD_PARAMS, _O(li->o), parents, depth, indent ), return NULL); |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
1285 } |
| 0 | 1286 } |
|
1119
79dd22145f52
Fix a number of compilation warnings
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
1287 return *buf; |
| 0 | 1288 } |
| 1289 | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1290 static DECLARE_FD_DUMP_PROTOTYPE(dump_object, struct dict_object * obj, int parents, int depth, int indent ) |
| 0 | 1291 { |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1292 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "%*s{dictobj}(@%p): ", indent, "", obj), return NULL); |
| 0 | 1293 |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1294 if (!verify_object(obj)) { |
|
1093
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
1295 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "INVALID/NULL"), return NULL); |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1296 return *buf; |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1297 } |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1298 |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1299 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "%s p:%p ", |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1300 _OBINFO(obj).name, |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1301 obj->parent), return NULL); |
| 0 | 1302 |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1303 if (obj->type == DICT_ENUMVAL) { |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1304 CHECK_MALLOC_DO( dump_enumval_data ( FD_DUMP_STD_PARAMS, &obj->data.enumval, obj->parent->data.type.type_base ), return NULL); |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1305 } else { |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1306 CHECK_MALLOC_DO( _OBINFO(obj).dump_data(FD_DUMP_STD_PARAMS, &obj->data), return NULL); |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1307 } |
| 0 | 1308 |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1309 if (parents) { |
|
1093
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
1310 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n%*sparent:", indent + 1, ""), return NULL); |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1311 CHECK_MALLOC_DO( dump_object (FD_DUMP_STD_PARAMS, obj->parent, parents-1, 0, 0 ), return NULL); |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1312 } |
| 0 | 1313 |
| 1314 if (depth) { | |
| 1315 int i; | |
| 1316 for (i=0; i<NB_LISTS_PER_OBJ; i++) { | |
| 1317 if ((obj->list[i].o == NULL) && (obj->list[i].next != &obj->list[i])) { | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1318 CHECK_MALLOC_DO( dump_list(FD_DUMP_STD_PARAMS, &obj->list[i], 0, depth - 1, indent + 2), return NULL); |
|
1093
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
1319 break; /* we get duplicate information sorted by another criteria otherwise, which is not very useful */ |
| 0 | 1320 } |
| 1321 } | |
| 1322 } | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1323 |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1324 return *buf; |
| 0 | 1325 } |
| 1326 | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1327 DECLARE_FD_DUMP_PROTOTYPE(fd_dict_dump_object, struct dict_object * obj) |
| 0 | 1328 { |
|
1093
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
1329 FD_DUMP_HANDLE_OFFSET(); |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1330 |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1331 CHECK_MALLOC_DO( dump_object(FD_DUMP_STD_PARAMS, obj, 1, 2, 0), return NULL); |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1332 |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1333 return *buf; |
| 0 | 1334 } |
| 1335 | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1336 DECLARE_FD_DUMP_PROTOTYPE(fd_dict_dump, struct dictionary * dict) |
| 0 | 1337 { |
| 1338 int i; | |
|
828
78307a61c578
Fix regression in dictionary dump
Sebastien Decugis <sdecugis@freediameter.net>
parents:
804
diff
changeset
|
1339 struct fd_list * li; |
|
1093
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
1340 |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
1341 FD_DUMP_HANDLE_OFFSET(); |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1342 |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1343 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{dictionary}(@%p): ", dict), return NULL); |
| 0 | 1344 |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1345 if ((dict == NULL) || (dict->dict_eyec != DICT_EYECATCHER)) { |
|
1093
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
1346 return fd_dump_extend(FD_DUMP_STD_PARAMS, "INVALID/NULL"); |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1347 } |
| 0 | 1348 |
| 1349 CHECK_POSIX_DO( pthread_rwlock_rdlock( &dict->dict_lock ), /* ignore */ ); | |
| 1350 | |
|
1093
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
1351 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n {dict(%p) : VENDORS / AVP / RULES}\n", dict), goto error); |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1352 CHECK_MALLOC_DO( dump_object (FD_DUMP_STD_PARAMS, &dict->dict_vendors, 0, 3, 3 ), goto error); |
|
1093
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
1353 for (li = dict->dict_vendors.list[0].next; li != &dict->dict_vendors.list[0]; li = li->next) { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
1354 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n"), return NULL); |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1355 CHECK_MALLOC_DO( dump_object (FD_DUMP_STD_PARAMS, li->o, 0, 3, 3 ), goto error); |
|
1093
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
1356 } |
| 0 | 1357 |
|
1093
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
1358 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n {dict(%p) : APPLICATIONS}\n", dict), goto error); |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1359 CHECK_MALLOC_DO( dump_object (FD_DUMP_STD_PARAMS, &dict->dict_applications, 0, 1, 3 ), goto error); |
|
1093
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
1360 for (li = dict->dict_applications.list[0].next; li != &dict->dict_applications.list[0]; li = li->next) { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
1361 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n"), return NULL); |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1362 CHECK_MALLOC_DO( dump_object (FD_DUMP_STD_PARAMS, li->o, 0, 1, 3 ), goto error); |
|
1093
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
1363 } |
| 0 | 1364 |
|
1093
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
1365 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n {dict(%p) : TYPES / ENUMVAL}", dict), goto error); |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1366 CHECK_MALLOC_DO( dump_list(FD_DUMP_STD_PARAMS, &dict->dict_types, 0, 2, 3 ), goto error); |
| 0 | 1367 |
|
1093
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
1368 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n {dict(%p) : COMMANDS / RULES}", dict), goto error); |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1369 CHECK_MALLOC_DO( dump_list(FD_DUMP_STD_PARAMS, &dict->dict_cmd_code, 0, 0, 3 ), goto error); |
| 0 | 1370 |
|
1093
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
1371 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n {dict(%p) : statistics}", dict), goto error); |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1372 for (i=1; i<=DICT_TYPE_MAX; i++) |
|
1093
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
1373 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n %5d: %s", dict->dict_count[i], dict_obj_info[i].name), goto error); |
| 0 | 1374 |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1375 CHECK_POSIX_DO( pthread_rwlock_unlock( &dict->dict_lock ), /* ignore */ ); |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1376 return *buf; |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1377 error: |
| 0 | 1378 /* Free the rwlock */ |
| 1379 CHECK_POSIX_DO( pthread_rwlock_unlock( &dict->dict_lock ), /* ignore */ ); | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1380 return NULL; |
| 0 | 1381 } |
| 1382 | |
|
156
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1383 /**************************** Dump AVP values ********************************/ |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1384 |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1385 /* Default dump functions */ |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1386 static DECLARE_FD_DUMP_PROTOTYPE(dump_val_os, union avp_value * value) |
|
156
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1387 { |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1388 int i; |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1389 |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1390 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "<"), return NULL); |
|
156
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1391 for (i = 0; i < value->os.len; i++) { |
|
1036
aecdc2fbf222
Add fd_msg_dump_full function that dumps a message in human-readable format.
Thomas Klausner <tk@giga.or.at>
parents:
1030
diff
changeset
|
1392 if (i == 1024) { /* Dump only up to 1024 bytes of the buffer */ |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1393 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "[...] (len=%zd)", value->os.len), return NULL); |
|
156
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1394 break; |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1395 } |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1396 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "%s%02hhX", (i==0 ? "" : " "), value->os.data[i]), return NULL); |
|
156
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1397 } |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1398 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, ">"), return NULL); |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1399 return *buf; |
|
156
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1400 } |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1401 |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1402 static DECLARE_FD_DUMP_PROTOTYPE(dump_val_i32, union avp_value * value) |
|
156
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1403 { |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1404 return fd_dump_extend( FD_DUMP_STD_PARAMS, "%i (0x%x)", value->i32, value->i32); |
|
156
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1405 } |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1406 |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1407 static DECLARE_FD_DUMP_PROTOTYPE(dump_val_i64, union avp_value * value) |
|
156
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1408 { |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1409 return fd_dump_extend( FD_DUMP_STD_PARAMS, "%" PRId64 " (0x%" PRIx64 ")", value->i64, value->i64); |
|
156
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1410 } |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1411 |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1412 static DECLARE_FD_DUMP_PROTOTYPE(dump_val_u32, union avp_value * value) |
|
156
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1413 { |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1414 return fd_dump_extend( FD_DUMP_STD_PARAMS, "%u (0x%x)", value->u32, value->u32); |
|
156
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1415 } |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1416 |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1417 static DECLARE_FD_DUMP_PROTOTYPE(dump_val_u64, union avp_value * value) |
|
156
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1418 { |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1419 return fd_dump_extend( FD_DUMP_STD_PARAMS, "%" PRIu64 " (0x%" PRIx64 ")", value->u64, value->u64); |
|
156
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1420 } |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1421 |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1422 static DECLARE_FD_DUMP_PROTOTYPE(dump_val_f32, union avp_value * value) |
|
156
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1423 { |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1424 return fd_dump_extend( FD_DUMP_STD_PARAMS, "%f", value->f32); |
|
156
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1425 } |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1426 |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1427 static DECLARE_FD_DUMP_PROTOTYPE(dump_val_f64, union avp_value * value) |
|
156
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1428 { |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1429 return fd_dump_extend( FD_DUMP_STD_PARAMS, "%g", value->f64); |
|
156
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1430 } |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1431 |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1432 /* Get the dump function for basic dict_avp_basetype */ |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1433 static DECLARE_FD_DUMP_PROTOTYPE((*get_default_dump_val_cb(enum dict_avp_basetype datatype)), union avp_value *) |
|
156
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1434 { |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1435 switch (datatype) { |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1436 case AVP_TYPE_OCTETSTRING: |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1437 return &dump_val_os; |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1438 |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1439 case AVP_TYPE_INTEGER32: |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1440 return &dump_val_i32; |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1441 |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1442 case AVP_TYPE_INTEGER64: |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1443 return &dump_val_i64; |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1444 |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1445 case AVP_TYPE_UNSIGNED32: |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1446 return &dump_val_u32; |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1447 |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1448 case AVP_TYPE_UNSIGNED64: |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1449 return &dump_val_u64; |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1450 |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1451 case AVP_TYPE_FLOAT32: |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1452 return &dump_val_f32; |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1453 |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1454 case AVP_TYPE_FLOAT64: |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1455 return &dump_val_f64; |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1456 |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1457 case AVP_TYPE_GROUPED: |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1458 TRACE_DEBUG(FULL, "error: grouped AVP with a value!"); |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1459 } |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1460 return NULL; |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1461 } |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1462 |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1463 /* indent inside an object (duplicate from messages.c) */ |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1464 #define INOBJHDR "%*s " |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1465 #define INOBJHDRVAL indent<0 ? 1 : indent, indent<0 ? "-" : "|" |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1466 |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1467 typedef DECLARE_FD_DUMP_PROTOTYPE((*dump_val_cb_t), union avp_value *); |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1468 |
|
1036
aecdc2fbf222
Add fd_msg_dump_full function that dumps a message in human-readable format.
Thomas Klausner <tk@giga.or.at>
parents:
1030
diff
changeset
|
1469 /* Formatter for the AVP value dump line */ |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1470 static DECLARE_FD_DUMP_PROTOTYPE(dump_avp_val, union avp_value *avp_value, |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1471 dump_val_cb_t def_dump_val_cb, |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1472 dump_val_cb_t dump_val_cb, |
|
804
c5b7d4a2cc77
Log message dumps in one call to the dump function to avoid fragmentation in the log files, as per Zack comment
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
788
diff
changeset
|
1473 enum dict_avp_basetype datatype, |
|
c5b7d4a2cc77
Log message dumps in one call to the dump function to avoid fragmentation in the log files, as per Zack comment
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
788
diff
changeset
|
1474 char * type_name, |
|
c5b7d4a2cc77
Log message dumps in one call to the dump function to avoid fragmentation in the log files, as per Zack comment
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
788
diff
changeset
|
1475 char * const_name, |
|
c5b7d4a2cc77
Log message dumps in one call to the dump function to avoid fragmentation in the log files, as per Zack comment
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
788
diff
changeset
|
1476 int indent, |
|
1036
aecdc2fbf222
Add fd_msg_dump_full function that dumps a message in human-readable format.
Thomas Klausner <tk@giga.or.at>
parents:
1030
diff
changeset
|
1477 int header) |
|
156
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1478 { |
|
1036
aecdc2fbf222
Add fd_msg_dump_full function that dumps a message in human-readable format.
Thomas Klausner <tk@giga.or.at>
parents:
1030
diff
changeset
|
1479 if (header) { |
|
aecdc2fbf222
Add fd_msg_dump_full function that dumps a message in human-readable format.
Thomas Klausner <tk@giga.or.at>
parents:
1030
diff
changeset
|
1480 /* Header for all AVP values dumps: */ |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1481 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, INOBJHDR "value ", INOBJHDRVAL), return NULL); |
|
156
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1482 |
|
1036
aecdc2fbf222
Add fd_msg_dump_full function that dumps a message in human-readable format.
Thomas Klausner <tk@giga.or.at>
parents:
1030
diff
changeset
|
1483 /* If the type is provided, write it */ |
|
aecdc2fbf222
Add fd_msg_dump_full function that dumps a message in human-readable format.
Thomas Klausner <tk@giga.or.at>
parents:
1030
diff
changeset
|
1484 if (type_name) { |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1485 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "t: '%s' ", type_name), return NULL); |
|
1036
aecdc2fbf222
Add fd_msg_dump_full function that dumps a message in human-readable format.
Thomas Klausner <tk@giga.or.at>
parents:
1030
diff
changeset
|
1486 } |
|
156
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1487 |
|
1036
aecdc2fbf222
Add fd_msg_dump_full function that dumps a message in human-readable format.
Thomas Klausner <tk@giga.or.at>
parents:
1030
diff
changeset
|
1488 /* Always give the base datatype anyway */ |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1489 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "(%s) ", type_base_name[datatype]), return NULL); |
|
1036
aecdc2fbf222
Add fd_msg_dump_full function that dumps a message in human-readable format.
Thomas Klausner <tk@giga.or.at>
parents:
1030
diff
changeset
|
1490 |
|
aecdc2fbf222
Add fd_msg_dump_full function that dumps a message in human-readable format.
Thomas Klausner <tk@giga.or.at>
parents:
1030
diff
changeset
|
1491 /* Now, the value */ |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1492 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "v: "), return NULL); |
|
1036
aecdc2fbf222
Add fd_msg_dump_full function that dumps a message in human-readable format.
Thomas Klausner <tk@giga.or.at>
parents:
1030
diff
changeset
|
1493 } |
|
804
c5b7d4a2cc77
Log message dumps in one call to the dump function to avoid fragmentation in the log files, as per Zack comment
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
788
diff
changeset
|
1494 if (const_name) { |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1495 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "'%s' (", const_name), return NULL); |
|
804
c5b7d4a2cc77
Log message dumps in one call to the dump function to avoid fragmentation in the log files, as per Zack comment
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
788
diff
changeset
|
1496 } |
|
c5b7d4a2cc77
Log message dumps in one call to the dump function to avoid fragmentation in the log files, as per Zack comment
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
788
diff
changeset
|
1497 if (dump_val_cb) { |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1498 CHECK_MALLOC_DO( (*dump_val_cb)( FD_DUMP_STD_PARAMS, avp_value), fd_dump_extend( FD_DUMP_STD_PARAMS, "(dump failed)")); |
|
804
c5b7d4a2cc77
Log message dumps in one call to the dump function to avoid fragmentation in the log files, as per Zack comment
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
788
diff
changeset
|
1499 } else { |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1500 CHECK_MALLOC_DO( (*def_dump_val_cb)( FD_DUMP_STD_PARAMS, avp_value), return NULL); |
|
804
c5b7d4a2cc77
Log message dumps in one call to the dump function to avoid fragmentation in the log files, as per Zack comment
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
788
diff
changeset
|
1501 } |
|
c5b7d4a2cc77
Log message dumps in one call to the dump function to avoid fragmentation in the log files, as per Zack comment
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
788
diff
changeset
|
1502 if (const_name) { |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1503 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, ")"), return NULL); |
|
804
c5b7d4a2cc77
Log message dumps in one call to the dump function to avoid fragmentation in the log files, as per Zack comment
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
788
diff
changeset
|
1504 } |
|
156
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1505 |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1506 /* Done! */ |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1507 return *buf; |
|
156
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1508 } |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1509 |
|
804
c5b7d4a2cc77
Log message dumps in one call to the dump function to avoid fragmentation in the log files, as per Zack comment
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
788
diff
changeset
|
1510 /* Dump the value of an AVP of known type into the returned str */ |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1511 DECLARE_FD_DUMP_PROTOTYPE(fd_dict_dump_avp_value, union avp_value *avp_value, struct dict_object * model, int indent, int header) |
|
156
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1512 { |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1513 DECLARE_FD_DUMP_PROTOTYPE((*dump_val_cb), union avp_value *avp_value) = NULL; |
|
156
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1514 struct dict_object * type = NULL; |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1515 char * type_name = NULL; |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1516 char * const_name = NULL; |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1517 |
|
1093
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
1518 FD_DUMP_HANDLE_OFFSET(); |
|
156
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1519 |
|
1252
5c6e94202c64
Fix dump of Failed-AVP content as a value is set while the model is not
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1121
diff
changeset
|
1520 /* Handle invalid parameters */ |
|
5c6e94202c64
Fix dump of Failed-AVP content as a value is set while the model is not
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1121
diff
changeset
|
1521 if (!avp_value) { |
|
5c6e94202c64
Fix dump of Failed-AVP content as a value is set while the model is not
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1121
diff
changeset
|
1522 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "(avp value not set)"), return NULL); |
|
5c6e94202c64
Fix dump of Failed-AVP content as a value is set while the model is not
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1121
diff
changeset
|
1523 return *buf; |
|
5c6e94202c64
Fix dump of Failed-AVP content as a value is set while the model is not
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1121
diff
changeset
|
1524 } |
|
5c6e94202c64
Fix dump of Failed-AVP content as a value is set while the model is not
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1121
diff
changeset
|
1525 |
|
5c6e94202c64
Fix dump of Failed-AVP content as a value is set while the model is not
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1121
diff
changeset
|
1526 if (!model) { |
|
5c6e94202c64
Fix dump of Failed-AVP content as a value is set while the model is not
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1121
diff
changeset
|
1527 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "(model not set)"), return NULL); |
|
5c6e94202c64
Fix dump of Failed-AVP content as a value is set while the model is not
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1121
diff
changeset
|
1528 return *buf; |
|
5c6e94202c64
Fix dump of Failed-AVP content as a value is set while the model is not
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1121
diff
changeset
|
1529 } |
|
5c6e94202c64
Fix dump of Failed-AVP content as a value is set while the model is not
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1121
diff
changeset
|
1530 |
|
5c6e94202c64
Fix dump of Failed-AVP content as a value is set while the model is not
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1121
diff
changeset
|
1531 if (! ( verify_object(model) && (model->type == DICT_AVP) )) { |
|
5c6e94202c64
Fix dump of Failed-AVP content as a value is set while the model is not
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1121
diff
changeset
|
1532 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "(invalid model)"), return NULL); |
|
5c6e94202c64
Fix dump of Failed-AVP content as a value is set while the model is not
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1121
diff
changeset
|
1533 return *buf; |
|
5c6e94202c64
Fix dump of Failed-AVP content as a value is set while the model is not
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1121
diff
changeset
|
1534 } |
|
156
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1535 |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1536 /* Get the type definition of this AVP */ |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1537 type = model->parent; |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1538 if (type) { |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1539 struct dict_enumval_request request; |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1540 struct dict_object * enumval = NULL; |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1541 |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1542 type_name = type->data.type.type_name; |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1543 |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1544 /* overwrite the dump function ? */ |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1545 if (type->data.type.type_dump) |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1546 dump_val_cb = type->data.type.type_dump; |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1547 |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1548 /* Now check if the AVP value matches a constant */ |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1549 memset(&request, 0, sizeof(request)); |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1550 request.type_obj = type; |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1551 memcpy(&request.search.enum_value, avp_value, sizeof(union avp_value)); |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1552 /* bypass checks */ |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1553 if ((search_enumval( type->dico, ENUMVAL_BY_STRUCT, &request, &enumval ) == 0) && (enumval)) { |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1554 /* We found a constant, get its name */ |
|
156
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1555 const_name = enumval->data.enumval.enum_name; |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1556 } |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1557 } |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1558 |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1559 /* And finally, dump the value */ |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1560 CHECK_MALLOC_DO( dump_avp_val(FD_DUMP_STD_PARAMS, avp_value, get_default_dump_val_cb(model->data.avp.avp_basetype), dump_val_cb, model->data.avp.avp_basetype, type_name, const_name, indent, header), return NULL ); |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1561 return *buf; |
|
156
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1562 } |
|
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
111
diff
changeset
|
1563 |
| 0 | 1564 /*******************************************************************************************************/ |
| 1565 /*******************************************************************************************************/ | |
| 1566 /* */ | |
| 1567 /* Exported functions */ | |
| 1568 /* */ | |
| 1569 /*******************************************************************************************************/ | |
| 1570 /*******************************************************************************************************/ | |
| 1571 | |
|
1
bafb831ba688
Fix names to proper case for freeDiameter
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
0
diff
changeset
|
1572 /* These are the functions exported outside libfreeDiameter. */ |
| 0 | 1573 |
| 1574 /* Get the data associated to an object */ | |
| 1575 int fd_dict_gettype ( struct dict_object * object, enum dict_object_type * type) | |
| 1576 { | |
| 1577 TRACE_ENTRY("%p %p", object, type); | |
| 1578 | |
| 1579 CHECK_PARAMS( type && verify_object(object) ); | |
| 1580 | |
| 1581 /* Copy the value and return */ | |
| 1582 *type = object->type; | |
| 1583 return 0; | |
| 1584 } | |
| 1585 | |
| 1586 int fd_dict_getdict ( struct dict_object * object, struct dictionary ** dict) | |
| 1587 { | |
| 1588 TRACE_ENTRY("%p %p", object, dict); | |
| 1589 | |
| 1590 CHECK_PARAMS( dict && verify_object(object) ); | |
| 1591 | |
| 1592 /* Copy the value and return */ | |
| 1593 *dict = object->dico; | |
| 1594 return 0; | |
| 1595 } | |
| 1596 | |
| 1597 | |
| 1598 /* Get the data associated to an object */ | |
| 1599 int fd_dict_getval ( struct dict_object * object, void * val) | |
| 1600 { | |
| 1601 TRACE_ENTRY("%p %p", object, val); | |
| 1602 | |
| 1603 CHECK_PARAMS( val && verify_object(object) ); | |
| 1604 | |
| 1605 /* Copy the value and return */ | |
| 1606 memcpy(val, &object->data, _OBINFO(object).datasize);; | |
| 1607 return 0; | |
| 1608 } | |
| 1609 | |
| 1610 /* Add a new object in the dictionary */ | |
| 1611 int fd_dict_new ( struct dictionary * dict, enum dict_object_type type, void * data, struct dict_object * parent, struct dict_object **ref ) | |
| 1612 { | |
| 1613 int ret = 0; | |
|
1316
2e868f71832f
Tentative fix for invalid pointers reported by Thomas.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1281
diff
changeset
|
1614 int dupos = 0; |
| 0 | 1615 struct dict_object * new = NULL; |
| 1616 struct dict_object * vendor = NULL; | |
|
658
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1617 struct dict_object * locref = NULL; |
| 0 | 1618 |
| 1619 TRACE_ENTRY("%p %d(%s) %p %p %p", dict, type, dict_obj_info[CHECK_TYPE(type) ? type : 0].name, data, parent, ref); | |
| 1620 | |
| 1621 /* Check parameters */ | |
| 1622 CHECK_PARAMS( dict && (dict->dict_eyec == DICT_EYECATCHER) && CHECK_TYPE(type) && data ); | |
| 1623 | |
| 1624 /* Check the "parent" parameter */ | |
| 1625 switch (dict_obj_info[type].parent) { | |
| 1626 case 0: /* parent is forbidden */ | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1627 CHECK_PARAMS_DO( parent == NULL, goto error_param ); |
| 0 | 1628 |
| 1629 case 1: /* parent is optional */ | |
| 1630 if (parent == NULL) | |
| 1631 break; | |
| 1632 | |
| 1633 case 2: /* parent is mandatory */ | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1634 CHECK_PARAMS_DO( verify_object(parent), goto error_param ); |
| 0 | 1635 |
| 1636 if (type == DICT_RULE ) { /* Special case : grouped AVP or Command parents are allowed */ | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1637 CHECK_PARAMS_DO( (parent->type == DICT_COMMAND ) |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1638 || ( (parent->type == DICT_AVP) && (parent->data.avp.avp_basetype == AVP_TYPE_GROUPED ) ), goto error_param ); |
| 0 | 1639 } else { |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1640 CHECK_PARAMS_DO( parent->type == dict_obj_info[type].parenttype, goto error_param ); |
| 0 | 1641 } |
| 1642 } | |
| 1643 | |
| 1644 /* For AVP object, we must also check that the "vendor" referenced exists */ | |
| 1645 if (type == DICT_AVP) { | |
| 1646 CHECK_FCT_DO( fd_dict_search( dict, DICT_VENDOR, VENDOR_BY_ID, &(((struct dict_avp_data *)data)->avp_vendor), (void*)&vendor, ENOENT ), | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1647 { TRACE_DEBUG(INFO, "Unable to find vendor '%d' referenced in the AVP data", ((struct dict_avp_data *)data)->avp_vendor); goto error_param; } ); |
| 0 | 1648 |
| 1649 /* Also check if a parent is provided, that the type are the same */ | |
| 1650 if (parent) { | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1651 CHECK_PARAMS_DO( parent->data.type.type_base == ((struct dict_avp_data *)data)->avp_basetype, goto error_param ); |
| 0 | 1652 } |
| 1653 } | |
| 1654 | |
| 1655 /* For RULE object, we must also check that the "avp" referenced exists */ | |
| 1656 if (type == DICT_RULE) { | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1657 CHECK_PARAMS_DO( verify_object(((struct dict_rule_data *)data)->rule_avp), goto error_param ); |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1658 CHECK_PARAMS_DO( ((struct dict_rule_data *)data)->rule_avp->type == DICT_AVP, goto error_param ); |
| 0 | 1659 } |
| 1660 | |
| 1661 /* For COMMAND object, check that the 'R' flag is fixed */ | |
| 1662 if (type == DICT_COMMAND) { | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1663 CHECK_PARAMS_DO( ((struct dict_cmd_data *)data)->cmd_flag_mask & CMD_FLAG_REQUEST, goto error_param ); |
| 0 | 1664 } |
|
1316
2e868f71832f
Tentative fix for invalid pointers reported by Thomas.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1281
diff
changeset
|
1665 |
|
2e868f71832f
Tentative fix for invalid pointers reported by Thomas.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1281
diff
changeset
|
1666 /* For ENUMVAL object, check if the parent type is an OctetString */ |
|
2e868f71832f
Tentative fix for invalid pointers reported by Thomas.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1281
diff
changeset
|
1667 if (type == DICT_ENUMVAL) { |
|
2e868f71832f
Tentative fix for invalid pointers reported by Thomas.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1281
diff
changeset
|
1668 if (parent->data.type.type_base == AVP_TYPE_OCTETSTRING) |
|
2e868f71832f
Tentative fix for invalid pointers reported by Thomas.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1281
diff
changeset
|
1669 dupos = 1; |
|
2e868f71832f
Tentative fix for invalid pointers reported by Thomas.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1281
diff
changeset
|
1670 } |
| 0 | 1671 |
|
109
a522268ec95b
Less permissive in fd_dict_new
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
43
diff
changeset
|
1672 /* We have to check that the new values are not equal to the sentinels */ |
|
a522268ec95b
Less permissive in fd_dict_new
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
43
diff
changeset
|
1673 if (type == DICT_VENDOR) { |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1674 CHECK_PARAMS_DO( ((struct dict_vendor_data *)data)->vendor_id != 0, goto error_param ); |
|
109
a522268ec95b
Less permissive in fd_dict_new
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
43
diff
changeset
|
1675 } |
|
a522268ec95b
Less permissive in fd_dict_new
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
43
diff
changeset
|
1676 if (type == DICT_APPLICATION) { |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1677 CHECK_PARAMS_DO( ((struct dict_application_data *)data)->application_id != 0, goto error_param ); |
|
109
a522268ec95b
Less permissive in fd_dict_new
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
43
diff
changeset
|
1678 } |
|
a522268ec95b
Less permissive in fd_dict_new
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
43
diff
changeset
|
1679 |
| 0 | 1680 /* Parameters are valid, create the new object */ |
| 1681 CHECK_MALLOC( new = malloc(sizeof(struct dict_object)) ); | |
| 1682 | |
| 1683 /* Initialize the data of the new object */ | |
| 1684 init_object(new, type); | |
|
1316
2e868f71832f
Tentative fix for invalid pointers reported by Thomas.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1281
diff
changeset
|
1685 init_object_data(new, data, type, dupos); |
| 0 | 1686 new->dico = dict; |
| 1687 new->parent = parent; | |
| 1688 | |
| 1689 /* We will change the dictionary => acquire the write lock */ | |
| 1690 CHECK_POSIX_DO( ret = pthread_rwlock_wrlock(&dict->dict_lock), goto error_free ); | |
| 1691 | |
| 1692 /* Now link the object -- this also checks that no object with same keys already exists */ | |
| 1693 switch (type) { | |
| 1694 case DICT_VENDOR: | |
| 1695 /* A vendor object is linked in the g_dict_vendors.list[0], by their id */ | |
|
658
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1696 ret = fd_list_insert_ordered ( &dict->dict_vendors.list[0], &new->list[0], (int (*)(void*, void *))order_vendor_by_id, (void **)&locref ); |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1697 if (ret) |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1698 goto error_unlock; |
| 0 | 1699 break; |
| 1700 | |
| 1701 case DICT_APPLICATION: | |
| 1702 /* An application object is linked in the g_dict_applciations.list[0], by their id */ | |
|
658
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1703 ret = fd_list_insert_ordered ( &dict->dict_applications.list[0], &new->list[0], (int (*)(void*, void *))order_appli_by_id, (void **)&locref ); |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1704 if (ret) |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1705 goto error_unlock; |
| 0 | 1706 break; |
| 1707 | |
| 1708 case DICT_TYPE: | |
| 1709 /* A type object is linked in g_list_types by its name */ | |
|
658
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1710 ret = fd_list_insert_ordered ( &dict->dict_types, &new->list[0], (int (*)(void*, void *))order_type_by_name, (void **)&locref ); |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1711 if (ret) |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1712 goto error_unlock; |
| 0 | 1713 break; |
| 1714 | |
| 1715 case DICT_ENUMVAL: | |
| 1716 /* A type_enum object is linked in it's parent 'type' object lists 1 and 2 by its name and values */ | |
|
658
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1717 ret = fd_list_insert_ordered ( &parent->list[1], &new->list[0], (int (*)(void*, void *))order_enum_by_name, (void **)&locref ); |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1718 if (ret) |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1719 goto error_unlock; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1720 |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1721 ret = fd_list_insert_ordered ( &parent->list[2], &new->list[1], (int (*)(void*, void *))order_enum_by_val, (void **)&locref ); |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1722 if (ret) { |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1723 fd_list_unlink(&new->list[0]); |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1724 goto error_unlock; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1725 } |
| 0 | 1726 break; |
| 1727 | |
| 1728 case DICT_AVP: | |
| 1729 /* An avp object is linked in lists 1 and 2 of its vendor, by code and name */ | |
|
658
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1730 ret = fd_list_insert_ordered ( &vendor->list[1], &new->list[0], (int (*)(void*, void *))order_avp_by_code, (void **)&locref ); |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1731 if (ret) |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1732 goto error_unlock; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1733 |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1734 ret = fd_list_insert_ordered ( &vendor->list[2], &new->list[1], (int (*)(void*, void *))order_avp_by_name, (void **)&locref ); |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1735 if (ret) { |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1736 fd_list_unlink(&new->list[0]); |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1737 goto error_unlock; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1738 } |
| 0 | 1739 break; |
| 1740 | |
| 1741 case DICT_COMMAND: | |
| 1742 /* A command object is linked in g_list_cmd_name and g_list_cmd_code by its name and code */ | |
|
658
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1743 ret = fd_list_insert_ordered ( &dict->dict_cmd_code, &new->list[1], (int (*)(void*, void *))order_cmd_by_codefl, (void **)&locref ); |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1744 if (ret) |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1745 goto error_unlock; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1746 |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1747 ret = fd_list_insert_ordered ( &dict->dict_cmd_name, &new->list[0], (int (*)(void*, void *))order_cmd_by_name, (void **)&locref ); |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1748 if (ret) { |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1749 fd_list_unlink(&new->list[1]); |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1750 goto error_unlock; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1751 } |
| 0 | 1752 break; |
| 1753 | |
| 1754 case DICT_RULE: | |
| 1755 /* A rule object is linked in list[2] of its parent command or AVP by the name of the AVP it refers */ | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
1756 ret = fd_list_insert_ordered ( &parent->list[2], &new->list[0], (int (*)(void*, void *))order_rule_by_avpvc, (void **)&locref ); |
|
658
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1757 if (ret) |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1758 goto error_unlock; |
| 0 | 1759 break; |
| 1760 | |
| 1761 default: | |
| 1762 ASSERT(0); | |
| 1763 } | |
| 1764 | |
| 1765 /* A new object has been created, increment the global counter */ | |
| 1766 dict->dict_count[type]++; | |
| 1767 | |
| 1768 /* Unlock the dictionary */ | |
| 1769 CHECK_POSIX_DO( ret = pthread_rwlock_unlock(&dict->dict_lock), goto error_free ); | |
| 1770 | |
| 1771 /* Save the pointer to the new object */ | |
| 1772 if (ref) | |
| 1773 *ref = new; | |
| 1774 | |
| 1775 return 0; | |
| 1776 | |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1777 error_param: |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1778 ret = EINVAL; |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1779 goto all_errors; |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1780 |
| 0 | 1781 error_unlock: |
| 1782 CHECK_POSIX_DO( pthread_rwlock_unlock(&dict->dict_lock), /* continue */ ); | |
|
658
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1783 if (ret == EEXIST) { |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1784 /* We have a duplicate key in locref. Check if the pointed object is the same or not */ |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1785 switch (type) { |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1786 case DICT_VENDOR: |
|
952
17ac99255475
Be explicit which entry already exists in the dictionary.
Thomas Klausner <tk@giga.or.at>
parents:
949
diff
changeset
|
1787 TRACE_DEBUG(FULL, "Vendor %s already in dictionary", new->data.vendor.vendor_name); |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
1788 /* if we are here, it means the two vendors id are identical */ |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
1789 if (fd_os_cmp(locref->data.vendor.vendor_name, locref->datastr_len, |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
1790 new->data.vendor.vendor_name, new->datastr_len)) { |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1791 TRACE_DEBUG(INFO, "Conflicting vendor name: %s", new->data.vendor.vendor_name); |
|
658
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1792 break; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1793 } |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1794 /* Otherwise (same name), we consider the function succeeded, since the (same) object is in the dictionary */ |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1795 ret = 0; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1796 break; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1797 |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1798 case DICT_APPLICATION: |
|
952
17ac99255475
Be explicit which entry already exists in the dictionary.
Thomas Klausner <tk@giga.or.at>
parents:
949
diff
changeset
|
1799 TRACE_DEBUG(FULL, "Application %s already in dictionary", new->data.application.application_name); |
|
658
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1800 /* got same id */ |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
1801 if (fd_os_cmp(locref->data.application.application_name, locref->datastr_len, |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
1802 new->data.application.application_name, new->datastr_len)) { |
|
658
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1803 TRACE_DEBUG(FULL, "Conflicting application name"); |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1804 break; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1805 } |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1806 ret = 0; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1807 break; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1808 |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1809 case DICT_TYPE: |
|
952
17ac99255475
Be explicit which entry already exists in the dictionary.
Thomas Klausner <tk@giga.or.at>
parents:
949
diff
changeset
|
1810 TRACE_DEBUG(FULL, "Type %s already in dictionary", new->data.type.type_name); |
|
658
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1811 /* got same name */ |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1812 if (locref->data.type.type_base != new->data.type.type_base) { |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1813 TRACE_DEBUG(FULL, "Conflicting base type"); |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1814 break; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1815 } |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1816 /* discard new definition only it a callback is provided and different from the previous one */ |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1817 if ((new->data.type.type_interpret) && (locref->data.type.type_interpret != new->data.type.type_interpret)) { |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1818 TRACE_DEBUG(FULL, "Conflicting interpret cb"); |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1819 break; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1820 } |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1821 if ((new->data.type.type_encode) && (locref->data.type.type_encode != new->data.type.type_encode)) { |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1822 TRACE_DEBUG(FULL, "Conflicting encode cb"); |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1823 break; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1824 } |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1825 if ((new->data.type.type_dump) && (locref->data.type.type_dump != new->data.type.type_dump)) { |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1826 TRACE_DEBUG(FULL, "Conflicting dump cb"); |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1827 break; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1828 } |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1829 ret = 0; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1830 break; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1831 |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1832 case DICT_ENUMVAL: |
|
952
17ac99255475
Be explicit which entry already exists in the dictionary.
Thomas Klausner <tk@giga.or.at>
parents:
949
diff
changeset
|
1833 TRACE_DEBUG(FULL, "Enum %s already in dictionary", new->data.enumval.enum_name); |
|
658
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1834 /* got either same name or same value. We check that both are true */ |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1835 if (order_enum_by_name(locref, new)) { |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1836 TRACE_DEBUG(FULL, "Conflicting enum name"); |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1837 break; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1838 } |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1839 if (order_enum_by_val(locref, new)) { |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1840 TRACE_DEBUG(FULL, "Conflicting enum value"); |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1841 break; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1842 } |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1843 ret = 0; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1844 break; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1845 |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1846 case DICT_AVP: |
|
952
17ac99255475
Be explicit which entry already exists in the dictionary.
Thomas Klausner <tk@giga.or.at>
parents:
949
diff
changeset
|
1847 TRACE_DEBUG(FULL, "AVP %s already in dictionary", new->data.avp.avp_name); |
|
658
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1848 /* got either same name or code */ |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1849 if (order_avp_by_code(locref, new)) { |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1850 TRACE_DEBUG(FULL, "Conflicting AVP code"); |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1851 break; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1852 } |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1853 if (order_avp_by_name(locref, new)) { |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1854 TRACE_DEBUG(FULL, "Conflicting AVP name"); |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1855 break; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1856 } |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1857 if (locref->data.avp.avp_vendor != new->data.avp.avp_vendor) { |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1858 TRACE_DEBUG(FULL, "Conflicting AVP vendor"); |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1859 break; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1860 } |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1861 if (locref->data.avp.avp_flag_mask != new->data.avp.avp_flag_mask) { |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1862 TRACE_DEBUG(FULL, "Conflicting AVP flags mask"); |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1863 break; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1864 } |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1865 if ((locref->data.avp.avp_flag_val & locref->data.avp.avp_flag_mask) != (new->data.avp.avp_flag_val & new->data.avp.avp_flag_mask)) { |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1866 TRACE_DEBUG(FULL, "Conflicting AVP flags value"); |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1867 break; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1868 } |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1869 if (locref->data.avp.avp_basetype != new->data.avp.avp_basetype) { |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1870 TRACE_DEBUG(FULL, "Conflicting AVP base type"); |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1871 break; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1872 } |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1873 ret = 0; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1874 break; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1875 |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1876 case DICT_COMMAND: |
|
952
17ac99255475
Be explicit which entry already exists in the dictionary.
Thomas Klausner <tk@giga.or.at>
parents:
949
diff
changeset
|
1877 TRACE_DEBUG(FULL, "Command %s already in dictionary", new->data.cmd.cmd_name); |
|
658
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1878 /* We got either same name, or same code + R flag */ |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1879 if (order_cmd_by_name(locref, new)) { |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1880 TRACE_DEBUG(FULL, "Conflicting command name"); |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1881 break; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1882 } |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1883 if (locref->data.cmd.cmd_code != new->data.cmd.cmd_code) { |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1884 TRACE_DEBUG(FULL, "Conflicting command code"); |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1885 break; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1886 } |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1887 if (locref->data.cmd.cmd_flag_mask != new->data.cmd.cmd_flag_mask) { |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1888 TRACE_DEBUG(FULL, "Conflicting command flags mask %hhx:%hhx", locref->data.cmd.cmd_flag_mask, new->data.cmd.cmd_flag_mask); |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1889 break; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1890 } |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1891 if ((locref->data.cmd.cmd_flag_val & locref->data.cmd.cmd_flag_mask) != (new->data.cmd.cmd_flag_val & new->data.cmd.cmd_flag_mask)) { |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1892 TRACE_DEBUG(FULL, "Conflicting command flags value"); |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1893 break; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1894 } |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1895 ret = 0; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1896 break; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1897 |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1898 case DICT_RULE: |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
1899 /* Both rules point to the same AVPs (code & vendor) */ |
|
658
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1900 if (locref->data.rule.rule_position != new->data.rule.rule_position) { |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1901 TRACE_DEBUG(FULL, "Conflicting rule position"); |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1902 break; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1903 } |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1904 if ( ((locref->data.rule.rule_position == RULE_FIXED_HEAD) || |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1905 (locref->data.rule.rule_position == RULE_FIXED_TAIL)) |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1906 && (locref->data.rule.rule_order != new->data.rule.rule_order)) { |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1907 TRACE_DEBUG(FULL, "Conflicting rule order"); |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1908 break; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1909 } |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1910 if (locref->data.rule.rule_min != new->data.rule.rule_min) { |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1911 int r1 = locref->data.rule.rule_min; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1912 int r2 = new->data.rule.rule_min; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1913 int p = locref->data.rule.rule_position; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1914 if ( ((r1 != -1) && (r2 != -1)) /* none of the definitions contains the "default" value */ |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1915 || ((p == RULE_OPTIONAL) && (r1 != 0) && (r2 != 0)) /* the other value is not 0 for an optional rule */ |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1916 || ((r1 != 1) && (r2 != 1)) /* the other value is not 1 for another rule */ |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1917 ) { |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1918 TRACE_DEBUG(FULL, "Conflicting rule min"); |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1919 break; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1920 } |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1921 } |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1922 if (locref->data.rule.rule_max != new->data.rule.rule_max) { |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1923 TRACE_DEBUG(FULL, "Conflicting rule max"); |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1924 break; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1925 } |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1926 ret = 0; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1927 break; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1928 } |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1929 if (!ret) { |
|
658
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1930 TRACE_DEBUG(FULL, "An existing object with the same data was found, ignoring the error..."); |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1931 } |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1932 if (ref) |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1933 *ref = locref; |
|
f198d16fa7f4
Initial commit for 1.1.0:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
602
diff
changeset
|
1934 } |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1935 all_errors: |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1936 if (ret != 0) { |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1937 char * buf = NULL; |
|
1121
ccbd1426e04a
Improve testmesg_stress to measure impact of loaded dictionary
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1938 size_t len = 0, offset=0; |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1939 |
|
1121
ccbd1426e04a
Improve testmesg_stress to measure impact of loaded dictionary
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1940 if (type == DICT_ENUMVAL) { |
|
ccbd1426e04a
Improve testmesg_stress to measure impact of loaded dictionary
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1941 CHECK_MALLOC( dump_enumval_data ( &buf, &len, &offset, data, parent->data.type.type_base )); |
|
ccbd1426e04a
Improve testmesg_stress to measure impact of loaded dictionary
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1942 } else { |
|
ccbd1426e04a
Improve testmesg_stress to measure impact of loaded dictionary
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1943 CHECK_MALLOC( dict_obj_info[CHECK_TYPE(type) ? type : 0].dump_data(&buf, &len, &offset, data) ); |
|
ccbd1426e04a
Improve testmesg_stress to measure impact of loaded dictionary
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1944 } |
|
ccbd1426e04a
Improve testmesg_stress to measure impact of loaded dictionary
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1945 |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1946 TRACE_DEBUG(INFO, "An error occurred while adding the following data in the dictionary: %s", buf); |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1947 |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1948 if (ret == EEXIST) { |
|
1121
ccbd1426e04a
Improve testmesg_stress to measure impact of loaded dictionary
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1949 offset=0; |
|
ccbd1426e04a
Improve testmesg_stress to measure impact of loaded dictionary
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1950 CHECK_MALLOC( dump_object(&buf, &len, &offset, locref, 0, 0, 0) ); |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1951 TRACE_DEBUG(INFO, "Conflicting entry in the dictionary: %s", buf); |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1952 } |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1953 free(buf); |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1052
diff
changeset
|
1954 } |
| 0 | 1955 error_free: |
| 1956 free(new); | |
| 1957 return ret; | |
| 1958 } | |
| 1959 | |
|
778
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1960 |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1961 int fd_dict_delete(struct dict_object * obj) |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1962 { |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1963 int i; |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1964 struct dictionary * dict; |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1965 int ret=0; |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1966 |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1967 /* check params */ |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1968 CHECK_PARAMS( verify_object(obj) && obj->dico); |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1969 dict = obj->dico; |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1970 |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1971 /* Lock the dictionary for change */ |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1972 CHECK_POSIX( pthread_rwlock_wrlock(&dict->dict_lock) ); |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1973 |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1974 /* check the object is not sentinel for another list */ |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1975 for (i=0; i<NB_LISTS_PER_OBJ; i++) { |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1976 if (!_OBINFO(obj).haslist[i] && !(FD_IS_LIST_EMPTY(&obj->list[i]))) { |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1977 /* There are children, this is not good */ |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1978 ret = EINVAL; |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1979 TRACE_DEBUG (FULL, "Cannot delete object, list %d not empty:", i); |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1980 #if 0 |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1981 dump_list(&obj->list[i], 0,0,0); |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1982 #endif |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1983 break; |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1984 } |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1985 } |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1986 |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1987 /* ok, now destroy the object */ |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1988 if (!ret) |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1989 destroy_object(obj); |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1990 |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1991 /* Unlock */ |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1992 CHECK_POSIX( pthread_rwlock_unlock(&dict->dict_lock) ); |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1993 |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1994 return ret; |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1995 } |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1996 |
|
003df4a9ade2
Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
770
diff
changeset
|
1997 |
|
907
b772af200865
Add a few const declaration so that C++ is less picky
Sebastien Decugis <sdecugis@freediameter.net>
parents:
906
diff
changeset
|
1998 int fd_dict_search ( struct dictionary * dict, enum dict_object_type type, int criteria, const void * what, struct dict_object **result, int retval ) |
| 0 | 1999 { |
| 2000 int ret = 0; | |
| 2001 | |
| 2002 TRACE_ENTRY("%p %d(%s) %d %p %p %d", dict, type, dict_obj_info[CHECK_TYPE(type) ? type : 0].name, criteria, what, result, retval); | |
| 2003 | |
| 2004 /* Check param */ | |
| 2005 CHECK_PARAMS( dict && (dict->dict_eyec == DICT_EYECATCHER) && CHECK_TYPE(type) ); | |
| 2006 | |
| 2007 /* Lock the dictionary for reading */ | |
| 2008 CHECK_POSIX( pthread_rwlock_rdlock(&dict->dict_lock) ); | |
| 2009 | |
| 2010 /* Now call the type-specific search function */ | |
| 2011 ret = dict_obj_info[type].search_fct (dict, criteria, what, result); | |
| 2012 | |
| 2013 /* Unlock */ | |
| 2014 CHECK_POSIX( pthread_rwlock_unlock(&dict->dict_lock) ); | |
| 2015 | |
| 2016 /* Update the return value as needed */ | |
| 2017 if ((result != NULL) && (*result == NULL)) | |
| 2018 ret = retval; | |
| 2019 | |
| 2020 return ret; | |
| 2021 } | |
| 2022 | |
|
764
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2023 /* Function to retrieve list of objects in the dictionary. Use with care (read only). |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2024 |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2025 All returned list must be accessed like this: |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2026 |
|
769
99136ec7d9d4
Fixed fd_dict_getlistof function, added a simple test
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
764
diff
changeset
|
2027 for (li = sentinel->next; li != sentinel; li=li->next) { |
|
764
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2028 struct dict_object * obj = li->o; |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2029 ... |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2030 } |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2031 |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2032 The following criteria are allowed, with corresponding parent. |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2033 The parent is either struct dictionary * or struct dict_object * |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2034 |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2035 VENDOR_BY_ID : (parent = dictionary) returns list of vendors ordered by ID |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2036 APPLICATION_BY_ID : (parent = dictionary) returns list of applications ordered by ID |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2037 ** for these two lists, the Vendor with id 0 and applciation with id 0 are excluded. |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2038 You must resolve them separatly with dict_search. |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2039 |
|
769
99136ec7d9d4
Fixed fd_dict_getlistof function, added a simple test
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
764
diff
changeset
|
2040 TYPE_BY_NAME : (parent = dictionary) returns list of types ordered by name (osstring order) |
|
99136ec7d9d4
Fixed fd_dict_getlistof function, added a simple test
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
764
diff
changeset
|
2041 ENUMVAL_BY_NAME : (parent = type object) return list of constants for this type ordered by name (osstring order) |
|
764
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2042 ENUMVAL_BY_VALUE : (parent = type object) return list of constants for this type ordered by values |
|
769
99136ec7d9d4
Fixed fd_dict_getlistof function, added a simple test
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
764
diff
changeset
|
2043 AVP_BY_NAME : (parent = vendor object) return list of AVP for this vendor ordered by name (osstring order) |
|
764
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2044 AVP_BY_CODE : (parent = vendor object) return list of AVP for this vendor ordered by code |
|
769
99136ec7d9d4
Fixed fd_dict_getlistof function, added a simple test
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
764
diff
changeset
|
2045 CMD_BY_NAME : (parent = dictionary) returns list of commands ordered by name (osstring order) |
|
764
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2046 CMD_BY_CODE_R : (parent = dictionary) returns list of commands ordered by code |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2047 RULE_BY_AVP_AND_PARENT: (parent = command or grouped AVP object) return list of rules for this object ordered by AVP vendor/code |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2048 |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2049 All other criteria are rejected. |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2050 */ |
|
769
99136ec7d9d4
Fixed fd_dict_getlistof function, added a simple test
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
764
diff
changeset
|
2051 int fd_dict_getlistof(int criteria, void * parent, struct fd_list ** sentinel) |
|
764
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2052 { |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2053 struct dictionary * dict = parent; |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2054 struct dict_object * obj_parent = parent; |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2055 |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2056 TRACE_ENTRY("%i %p %p", criteria, parent, sentinel); |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2057 |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2058 CHECK_PARAMS(sentinel && parent); |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2059 |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2060 switch(criteria) { |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2061 case VENDOR_BY_ID: /* parent must be the dictionary */ |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2062 CHECK_PARAMS(dict->dict_eyec == DICT_EYECATCHER); |
|
769
99136ec7d9d4
Fixed fd_dict_getlistof function, added a simple test
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
764
diff
changeset
|
2063 *sentinel = &dict->dict_vendors.list[0]; |
|
764
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2064 break; |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2065 |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2066 case APPLICATION_BY_ID: /* parent must be the dictionary */ |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2067 CHECK_PARAMS(dict->dict_eyec == DICT_EYECATCHER); |
|
769
99136ec7d9d4
Fixed fd_dict_getlistof function, added a simple test
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
764
diff
changeset
|
2068 *sentinel = &dict->dict_applications.list[0]; |
|
764
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2069 break; |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2070 |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2071 case TYPE_BY_NAME: /* parent must be the dictionary */ |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2072 CHECK_PARAMS(dict->dict_eyec == DICT_EYECATCHER); |
|
769
99136ec7d9d4
Fixed fd_dict_getlistof function, added a simple test
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
764
diff
changeset
|
2073 *sentinel = &dict->dict_types; |
|
764
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2074 break; |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2075 |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2076 case ENUMVAL_BY_NAME: /* parent must be a type object */ |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2077 CHECK_PARAMS(verify_object(obj_parent) && (obj_parent->type == DICT_TYPE)); |
|
769
99136ec7d9d4
Fixed fd_dict_getlistof function, added a simple test
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
764
diff
changeset
|
2078 *sentinel = &obj_parent->list[1]; |
|
764
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2079 break; |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2080 |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2081 case ENUMVAL_BY_VALUE: /* parent must be a type object */ |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2082 CHECK_PARAMS(verify_object(obj_parent) && (obj_parent->type == DICT_TYPE)); |
|
769
99136ec7d9d4
Fixed fd_dict_getlistof function, added a simple test
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
764
diff
changeset
|
2083 *sentinel = &obj_parent->list[2]; |
|
764
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2084 break; |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2085 |
|
769
99136ec7d9d4
Fixed fd_dict_getlistof function, added a simple test
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
764
diff
changeset
|
2086 case AVP_BY_NAME: /* parent must be a VENDOR object */ |
|
99136ec7d9d4
Fixed fd_dict_getlistof function, added a simple test
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
764
diff
changeset
|
2087 CHECK_PARAMS(verify_object(obj_parent) && (obj_parent->type == DICT_VENDOR)); |
|
99136ec7d9d4
Fixed fd_dict_getlistof function, added a simple test
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
764
diff
changeset
|
2088 *sentinel = &obj_parent->list[2]; |
|
764
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2089 break; |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2090 |
|
769
99136ec7d9d4
Fixed fd_dict_getlistof function, added a simple test
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
764
diff
changeset
|
2091 case AVP_BY_CODE: /* parent must be a VENDOR object */ |
|
99136ec7d9d4
Fixed fd_dict_getlistof function, added a simple test
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
764
diff
changeset
|
2092 CHECK_PARAMS(verify_object(obj_parent) && (obj_parent->type == DICT_VENDOR)); |
|
99136ec7d9d4
Fixed fd_dict_getlistof function, added a simple test
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
764
diff
changeset
|
2093 *sentinel = &obj_parent->list[1]; |
|
764
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2094 break; |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2095 |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2096 case CMD_BY_NAME: /* parent must be the dictionary */ |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2097 CHECK_PARAMS(dict->dict_eyec == DICT_EYECATCHER); |
|
769
99136ec7d9d4
Fixed fd_dict_getlistof function, added a simple test
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
764
diff
changeset
|
2098 *sentinel = &dict->dict_cmd_name; |
|
764
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2099 break; |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2100 |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2101 case CMD_BY_CODE_R: /* parent must be the dictionary */ |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2102 CHECK_PARAMS(dict->dict_eyec == DICT_EYECATCHER); |
|
769
99136ec7d9d4
Fixed fd_dict_getlistof function, added a simple test
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
764
diff
changeset
|
2103 *sentinel = &dict->dict_cmd_code; |
|
764
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2104 break; |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2105 |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2106 case RULE_BY_AVP_AND_PARENT: /* parent must be command or grouped AVP */ |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2107 CHECK_PARAMS(verify_object(obj_parent)); |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2108 CHECK_PARAMS( (obj_parent->type == DICT_COMMAND) || |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2109 ((obj_parent->type == DICT_AVP) |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2110 && (obj_parent->data.avp.avp_basetype == AVP_TYPE_GROUPED)) ); |
|
769
99136ec7d9d4
Fixed fd_dict_getlistof function, added a simple test
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
764
diff
changeset
|
2111 *sentinel = &obj_parent->list[2]; |
|
764
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2112 break; |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2113 |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2114 default: |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2115 CHECK_PARAMS(0); |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2116 } |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2117 |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2118 return 0; |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2119 } |
|
f53e5b5fdfd3
Added new experimental function fd_dict_getlistof -- see http://lists.freediameter.net/pipermail/help/2011-October/000268.html for context and rationale. WARNING: this function was not tested yet...
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2120 |
| 0 | 2121 /*******************************************************************************************************/ |
| 2122 /*******************************************************************************************************/ | |
| 2123 /* */ | |
| 2124 /* The init/fini functions */ | |
| 2125 /* */ | |
| 2126 /*******************************************************************************************************/ | |
| 2127 /*******************************************************************************************************/ | |
| 2128 | |
| 2129 /* Initialize the dictionary */ | |
| 2130 int fd_dict_init ( struct dictionary ** dict) | |
| 2131 { | |
| 2132 struct dictionary * new = NULL; | |
| 2133 | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
2134 TRACE_ENTRY("%p", dict); |
| 0 | 2135 |
| 2136 /* Sanity checks */ | |
| 2137 ASSERT( (sizeof(type_base_name) / sizeof(type_base_name[0])) == (AVP_TYPE_MAX + 1) ); | |
| 2138 ASSERT( (sizeof(dict_obj_info) / sizeof(dict_obj_info[0])) == (DICT_TYPE_MAX + 1) ); | |
| 2139 CHECK_PARAMS(dict); | |
| 2140 | |
| 2141 /* Allocate the memory for the dictionary */ | |
| 2142 CHECK_MALLOC( new = malloc(sizeof(struct dictionary)) ); | |
| 2143 memset(new, 0, sizeof(struct dictionary)); | |
| 2144 | |
| 2145 new->dict_eyec = DICT_EYECATCHER; | |
| 2146 | |
| 2147 /* Initialize the lock for the dictionary */ | |
| 2148 CHECK_POSIX( pthread_rwlock_init(&new->dict_lock, NULL) ); | |
| 2149 | |
| 2150 /* Initialize the sentinel for vendors and AVP lists */ | |
| 2151 init_object( &new->dict_vendors, DICT_VENDOR ); | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
2152 #define NO_VENDOR_NAME "(no vendor)" |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
2153 new->dict_vendors.data.vendor.vendor_name = NO_VENDOR_NAME; |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
2154 new->dict_vendors.datastr_len = CONSTSTRLEN(NO_VENDOR_NAME); |
|
770
27fef2ca2cf6
Improved usability of fd_dict_getlistof for vendors and apps
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
769
diff
changeset
|
2155 /* new->dict_vendors.list[0].o = NULL; *//* overwrite since element is also sentinel for this list. */ |
|
111
3b6174b6b35b
Fix fd_dict_getdict command for sentinels in the dictionary
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
109
diff
changeset
|
2156 new->dict_vendors.dico = new; |
| 0 | 2157 |
|
43
2db15632a63d
Added a large part of connection establishment logic, to test
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2158 /* Initialize the sentinel for applications */ |
| 0 | 2159 init_object( &new->dict_applications, DICT_APPLICATION ); |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
2160 #define APPLICATION_0_NAME "Diameter Common Messages" |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
2161 new->dict_applications.data.application.application_name = APPLICATION_0_NAME; |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
2162 new->dict_applications.datastr_len = CONSTSTRLEN(APPLICATION_0_NAME); |
|
770
27fef2ca2cf6
Improved usability of fd_dict_getlistof for vendors and apps
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
769
diff
changeset
|
2163 /* new->dict_applications.list[0].o = NULL; *//* overwrite since since element is also sentinel for this list. */ |
|
111
3b6174b6b35b
Fix fd_dict_getdict command for sentinels in the dictionary
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
109
diff
changeset
|
2164 new->dict_applications.dico = new; |
| 0 | 2165 |
| 2166 /* Initialize the sentinel for types */ | |
| 2167 fd_list_init ( &new->dict_types, NULL ); | |
| 2168 | |
| 2169 /* Initialize the sentinels for commands */ | |
| 2170 fd_list_init ( &new->dict_cmd_name, NULL ); | |
| 2171 fd_list_init ( &new->dict_cmd_code, NULL ); | |
| 2172 | |
| 2173 /* Initialize the error command object */ | |
| 2174 init_object( &new->dict_cmd_error, DICT_COMMAND ); | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
2175 #define GENERIC_ERROR_NAME "(generic error format)" |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
2176 new->dict_cmd_error.data.cmd.cmd_name = GENERIC_ERROR_NAME; |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
687
diff
changeset
|
2177 new->dict_cmd_error.datastr_len = CONSTSTRLEN(GENERIC_ERROR_NAME); |
| 0 | 2178 new->dict_cmd_error.data.cmd.cmd_flag_mask=CMD_FLAG_ERROR | CMD_FLAG_REQUEST | CMD_FLAG_RETRANSMIT; |
| 2179 new->dict_cmd_error.data.cmd.cmd_flag_val =CMD_FLAG_ERROR; | |
|
111
3b6174b6b35b
Fix fd_dict_getdict command for sentinels in the dictionary
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
109
diff
changeset
|
2180 new->dict_cmd_error.dico = new; |
| 0 | 2181 |
| 2182 *dict = new; | |
| 2183 | |
| 2184 /* Done */ | |
| 2185 return 0; | |
| 2186 } | |
| 2187 | |
| 2188 /* Destroy a dictionary */ | |
| 2189 int fd_dict_fini ( struct dictionary ** dict) | |
| 2190 { | |
| 2191 int i; | |
| 2192 | |
| 2193 TRACE_ENTRY(""); | |
| 2194 CHECK_PARAMS( dict && *dict && ((*dict)->dict_eyec == DICT_EYECATCHER) ); | |
| 2195 | |
| 2196 /* Acquire the write lock to make sure no other operation is ongoing */ | |
| 2197 CHECK_POSIX( pthread_rwlock_wrlock(&(*dict)->dict_lock) ); | |
| 2198 | |
| 2199 /* Empty all the lists, free the elements */ | |
| 2200 destroy_list ( &(*dict)->dict_cmd_error.list[2] ); | |
| 2201 destroy_list ( &(*dict)->dict_cmd_code ); | |
| 2202 destroy_list ( &(*dict)->dict_cmd_name ); | |
| 2203 destroy_list ( &(*dict)->dict_types ); | |
| 2204 for (i=0; i< NB_LISTS_PER_OBJ; i++) { | |
| 2205 destroy_list ( &(*dict)->dict_applications.list[i] ); | |
| 2206 destroy_list ( &(*dict)->dict_vendors.list[i] ); | |
| 2207 } | |
| 2208 | |
| 2209 /* Dictionary is empty, now destroy the lock */ | |
| 2210 CHECK_POSIX( pthread_rwlock_unlock(&(*dict)->dict_lock) ); | |
| 2211 CHECK_POSIX( pthread_rwlock_destroy(&(*dict)->dict_lock) ); | |
| 2212 | |
| 2213 free(*dict); | |
| 2214 *dict = NULL; | |
| 2215 | |
| 2216 return 0; | |
| 2217 } | |
| 2218 | |
| 2219 /*******************************************************************************************************/ | |
| 2220 /*******************************************************************************************************/ | |
| 2221 /* */ | |
| 2222 /* Other functions */ | |
| 2223 /* */ | |
| 2224 /*******************************************************************************************************/ | |
| 2225 /*******************************************************************************************************/ | |
| 2226 | |
| 2227 /* Iterate a callback on the rules for an object */ | |
| 2228 int fd_dict_iterate_rules ( struct dict_object *parent, void * data, int (*cb)(void *, struct dict_rule_data *) ) | |
| 2229 { | |
| 2230 int ret = 0; | |
| 2231 struct fd_list * li; | |
| 2232 | |
| 2233 TRACE_ENTRY("%p %p %p", parent, data, cb); | |
| 2234 | |
| 2235 /* Check parameters */ | |
| 2236 CHECK_PARAMS( verify_object(parent) ); | |
| 2237 CHECK_PARAMS( (parent->type == DICT_COMMAND) | |
| 2238 || ((parent->type == DICT_AVP) && (parent->data.avp.avp_basetype == AVP_TYPE_GROUPED)) ); | |
| 2239 TRACE_DEBUG (FULL, "Iterating on rules of %s: '%s'.", | |
| 2240 _OBINFO(parent).name, | |
| 2241 parent->type == DICT_COMMAND ? | |
| 2242 parent->data.cmd.cmd_name | |
| 2243 : parent->data.avp.avp_name); | |
| 2244 | |
| 2245 /* Acquire the read lock */ | |
| 2246 CHECK_POSIX( pthread_rwlock_rdlock(&parent->dico->dict_lock) ); | |
| 2247 | |
| 2248 /* go through the list and call the cb on each rule data */ | |
| 2249 for (li = &(parent->list[2]); li->next != &(parent->list[2]); li = li->next) { | |
| 2250 ret = (*cb)(data, &(_O(li->next->o)->data.rule)); | |
| 2251 if (ret != 0) | |
| 2252 break; | |
| 2253 } | |
| 2254 | |
| 2255 /* Release the lock */ | |
| 2256 CHECK_POSIX( pthread_rwlock_unlock(&parent->dico->dict_lock) ); | |
| 2257 | |
| 2258 return ret; | |
| 2259 } | |
| 2260 | |
| 2261 /* Create the list of vendors. Returns a 0-terminated array, that must be freed after use. Returns NULL on error. */ | |
| 2262 uint32_t * fd_dict_get_vendorid_list(struct dictionary * dict) | |
| 2263 { | |
| 2264 uint32_t * ret = NULL; | |
| 2265 int i = 0; | |
| 2266 struct fd_list * li; | |
| 2267 | |
| 2268 TRACE_ENTRY(); | |
| 2269 | |
| 2270 /* Acquire the read lock */ | |
| 2271 CHECK_POSIX_DO( pthread_rwlock_rdlock(&dict->dict_lock), return NULL ); | |
| 2272 | |
| 2273 /* Allocate an array to contain all the elements */ | |
| 2274 CHECK_MALLOC_DO( ret = calloc( dict->dict_count[DICT_VENDOR] + 1, sizeof(uint32_t) ), goto out ); | |
| 2275 | |
| 2276 /* Copy the vendors IDs */ | |
| 2277 for (li = dict->dict_vendors.list[0].next; li != &(dict->dict_vendors.list[0]); li = li->next) { | |
| 2278 ret[i] = _O(li->o)->data.vendor.vendor_id; | |
| 2279 i++; | |
| 2280 ASSERT( i <= dict->dict_count[DICT_VENDOR] ); | |
| 2281 } | |
| 2282 out: | |
| 2283 /* Release the lock */ | |
| 2284 CHECK_POSIX_DO( pthread_rwlock_unlock(&dict->dict_lock), return NULL ); | |
| 2285 | |
| 2286 return ret; | |
| 2287 } | |
| 2288 | |
| 2289 /* Return the location of the cb list for an object, after checking its type */ | |
| 2290 int fd_dict_disp_cb(enum dict_object_type type, struct dict_object *obj, struct fd_list ** cb_list) | |
| 2291 { | |
| 2292 TRACE_ENTRY("%d %p %p", type, obj, cb_list); | |
| 2293 CHECK_PARAMS( verify_object(obj) ); | |
| 2294 CHECK_PARAMS( _OBINFO(obj).type == type ); | |
| 2295 CHECK_PARAMS( cb_list ); | |
| 2296 *cb_list = &obj->disp_cbs; | |
| 2297 return 0; | |
| 2298 } | |
| 2299 | |
| 2300 int fd_dict_get_error_cmd(struct dictionary * dict, struct dict_object **obj) | |
| 2301 { | |
| 2302 TRACE_ENTRY("%p %p", dict, obj); | |
| 2303 CHECK_PARAMS( dict && (dict->dict_eyec == DICT_EYECATCHER) && obj ); | |
| 2304 *obj = &dict->dict_cmd_error; | |
| 2305 return 0; | |
| 2306 } |