Mercurial > hg > freeDiameter
annotate libfreeDiameter/messages.c @ 638:9448cba86673
Improved usability of dbg_interactive
| author | Sebastien Decugis <sdecugis@nict.go.jp> |
|---|---|
| date | Fri, 17 Dec 2010 18:41:19 +0900 |
| parents | 22e8fac3b2d6 |
| children | cfc8da9264f4 |
| rev | line source |
|---|---|
| 0 | 1 /********************************************************************************************************* |
| 2 * Software License Agreement (BSD License) * | |
| 3 * Author: Sebastien Decugis <sdecugis@nict.go.jp> * | |
| 4 * * | |
|
258
5df55136361b
Updated copyright information
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
156
diff
changeset
|
5 * Copyright (c) 2010, 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 | |
| 36 /* Messages module. | |
| 37 * | |
| 38 * This module allows to manipulate the msg and avp structures that represents a Diameter message in memory. | |
| 39 */ | |
| 40 | |
|
1
bafb831ba688
Fix names to proper case for freeDiameter
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
0
diff
changeset
|
41 #include "libfD.h" |
| 0 | 42 |
| 43 #include <sys/param.h> | |
| 44 | |
| 45 /* Type of object */ | |
| 46 enum msg_objtype { | |
| 47 MSG_MSG = 1, | |
| 48 MSG_AVP | |
| 49 }; | |
| 50 | |
| 51 /* Chaining of elements as a free hierarchy */ | |
| 52 struct msg_avp_chain { | |
| 53 struct fd_list chaining; /* Chaining information at this level. */ | |
| 54 struct fd_list children; /* sentinel for the children of this object */ | |
| 55 enum msg_objtype type; /* Type of this object, _MSG_MSG or _MSG_AVP */ | |
| 56 }; | |
| 57 | |
| 58 /* Return the chain information from an AVP or MSG. Since it's the first field, we just cast */ | |
| 59 #define _C(_x) ((struct msg_avp_chain *)(_x)) | |
| 60 | |
| 61 /* Some details about chaining: | |
| 62 * | |
| 63 * A message is made of a header ( msg ) and 0 or more AVPs ( avp ). | |
| 64 * The structure is a kind of tree, where some AVPs (grouped AVPs) can contain other AVPs. | |
| 65 * Exemple: | |
| 66 * msg | |
| 67 * |-avp | |
| 68 * |-gavp | |
| 69 * | |-avp | |
| 70 * | |-avp | |
| 71 * | \-avp | |
| 72 * |-avp | |
| 73 * \-avp | |
| 74 * | |
| 75 * Each item (msg or avp) structure begins with a msg_avp_chain structure. | |
| 76 * The element at the top of the hierarchy (msg in our example) has all the fields of its "chaining" equal to the same value. | |
| 77 * | |
| 78 * All elements at the same level are linked by their "chaining" list. | |
| 79 * The "children" list is the sentinel for the lists of children of this element. | |
| 80 */ | |
| 81 | |
| 82 /* The following definitions are used to recognize objects in memory. */ | |
| 83 #define MSG_MSG_EYEC (0x11355463) | |
| 84 #define MSG_AVP_EYEC (0x11355467) | |
| 85 | |
| 86 /* The following structure represents an AVP instance. */ | |
| 87 struct avp { | |
| 88 struct msg_avp_chain avp_chain; /* Chaining information of this AVP */ | |
| 89 int avp_eyec; /* Must be equal to MSG_AVP_EYEC */ | |
| 90 struct dict_object *avp_model; /* If not NULL, pointer to the dictionary object of this avp */ | |
| 91 struct avp_hdr avp_public; /* AVP data that can be managed by other modules */ | |
| 92 | |
| 93 uint8_t *avp_source; /* If the message was parsed from a buffer, pointer to the AVP data start in the buffer. */ | |
| 94 uint8_t *avp_rawdata; /* when the data can not be interpreted, the raw data is copied here. The header is not part of it. */ | |
| 95 size_t avp_rawlen; /* The length of the raw buffer. */ | |
| 96 union avp_value avp_storage; /* To avoid many alloc/free, store the integer values here and set avp_public.avp_data to &storage */ | |
| 97 int avp_mustfreeos; /* 1 if an octetstring is malloc'd in avp_storage and must be freed. */ | |
| 98 }; | |
| 99 | |
| 100 /* Macro to compute the AVP header size */ | |
| 101 #define AVPHDRSZ_NOVEND 8 | |
| 102 #define AVPHDRSZ_VENDOR 12 | |
| 103 #define GETAVPHDRSZ( _flag ) ((_flag & AVP_FLAG_VENDOR) ? AVPHDRSZ_VENDOR : AVPHDRSZ_NOVEND) | |
| 104 | |
| 105 /* Macro to cast a msg_avp_t */ | |
| 106 #define _A(_x) ((struct avp *)(_x)) | |
| 107 /* Check the type and eyecatcher */ | |
| 108 #define CHECK_AVP(_x) ((_C(_x)->type == MSG_AVP) && (_A(_x)->avp_eyec == MSG_AVP_EYEC)) | |
| 109 | |
| 110 /* The following structure represents an instance of a message (command and children AVPs). */ | |
| 111 struct msg { | |
| 112 struct msg_avp_chain msg_chain; /* List of the AVPs in the message */ | |
| 113 int msg_eyec; /* Must be equal to MSG_MSG_EYEC */ | |
| 114 struct dict_object *msg_model; /* If not NULL, pointer to the dictionary object of this message */ | |
| 115 struct msg_hdr msg_public; /* Message data that can be managed by extensions. */ | |
| 116 | |
| 117 uint8_t *msg_rawbuffer; /* data buffer that was received, saved during fd_msg_parse_buffer and freed in fd_msg_parse_dict */ | |
| 118 int msg_routable; /* Is this a routable message? (0: undef, 1: routable, 2: non routable) */ | |
| 119 struct msg *msg_query; /* the associated query if the message is a received answer */ | |
|
637
22e8fac3b2d6
Split interface file in modules
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
400
diff
changeset
|
120 int msg_associated; /* and the counter part information in the query, to avoid double free */ |
|
83
c662d3eb6ff6
Started support for routing module
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
37
diff
changeset
|
121 struct rt_data *msg_rtdata; /* Routing list for the query */ |
|
85
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
122 struct session *msg_sess; /* Cached message session if any */ |
| 0 | 123 struct { |
| 124 void (*fct)(void *, struct msg **); | |
| 125 void * data; | |
| 126 } msg_cb; /* Callback to be called when an answer is received, if not NULL */ | |
| 127 char * msg_src_id; /* Diameter Id of the peer this message was received from. This string is malloc'd and must be freed */ | |
| 128 }; | |
| 129 | |
| 130 /* Macro to compute the message header size */ | |
| 131 #define GETMSGHDRSZ() 20 | |
| 132 | |
| 133 /* Macro to cast a msg_avp_t */ | |
| 134 #define _M(_x) ((struct msg *)(_x)) | |
| 135 /* Check the type and eyecatcher */ | |
| 136 #define CHECK_MSG(_x) ((_C(_x)->type == MSG_MSG) && (_M(_x)->msg_eyec == MSG_MSG_EYEC)) | |
| 137 | |
| 138 #define VALIDATE_OBJ(_x) ( (CHECK_MSG(_x)) || (CHECK_AVP(_x)) ) | |
| 139 | |
| 140 | |
| 141 /* Macro to validate a MSGFL_ value */ | |
|
638
9448cba86673
Improved usability of dbg_interactive
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
637
diff
changeset
|
142 #define CHECK_AVPFL(_fl) ( ((_fl) & (- (AVPFL_MAX << 1) )) == 0 ) |
| 0 | 143 #define CHECK_MSGFL(_fl) ( ((_fl) & (- (MSGFL_MAX << 1) )) == 0 ) |
| 144 | |
| 145 | |
| 146 /* initial sizes of AVP from their types, in bytes. */ | |
| 147 static int avp_value_sizes[] = { | |
| 148 0, /* AVP_TYPE_GROUPED: size is dynamic */ | |
| 149 0, /* AVP_TYPE_OCTETSTRING: size is dynamic */ | |
| 150 4, /* AVP_TYPE_INTEGER32: size is 32 bits */ | |
| 151 8, /* AVP_TYPE_INTEGER64: size is 64 bits */ | |
| 152 4, /* AVP_TYPE_UNSIGNED32: size is 32 bits */ | |
| 153 8, /* AVP_TYPE_UNSIGNED64: size is 64 bits */ | |
| 154 4, /* AVP_TYPE_FLOAT32: size is 32 bits */ | |
| 155 8 /* AVP_TYPE_FLOAT64: size is 64 bits */ | |
| 156 }; | |
| 157 #define CHECK_BASETYPE( _type ) ( ((_type) <= AVP_TYPE_MAX) && ((_type) >= 0) ) | |
| 158 #define GETINITIALSIZE( _type, _vend ) (avp_value_sizes[ CHECK_BASETYPE(_type) ? (_type) : 0] + GETAVPHDRSZ(_vend)) | |
| 159 | |
| 160 /* Forward declaration */ | |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
161 static int parsedict_do_msg(struct dictionary * dict, struct msg * msg, int only_hdr, struct fd_pei *error_info); |
| 0 | 162 |
| 163 /***************************************************************************************************************/ | |
| 164 /* Creating objects */ | |
| 165 | |
| 166 /* Initialize a msg_avp_chain structure */ | |
| 167 static void init_chain(struct msg_avp_chain * chain, int type) | |
| 168 { | |
| 169 fd_list_init( &chain->chaining, (void *)chain); | |
| 170 fd_list_init( &chain->children, (void *)chain); | |
| 171 chain->type = type; | |
| 172 } | |
| 173 | |
| 174 /* Initialize a new AVP object */ | |
| 175 static void init_avp ( struct avp * avp ) | |
| 176 { | |
| 177 TRACE_ENTRY("%p", avp); | |
| 178 | |
| 179 memset(avp, 0, sizeof(struct avp)); | |
| 180 init_chain( &avp->avp_chain, MSG_AVP); | |
| 181 avp->avp_eyec = MSG_AVP_EYEC; | |
| 182 } | |
| 183 | |
| 184 /* Initialize a new MSG object */ | |
| 185 static void init_msg ( struct msg * msg ) | |
| 186 { | |
| 187 TRACE_ENTRY("%p", msg); | |
| 188 | |
| 189 memset(msg, 0, sizeof(struct msg)); | |
| 190 init_chain( &msg->msg_chain, MSG_MSG); | |
| 191 msg->msg_eyec = MSG_MSG_EYEC; | |
| 192 } | |
| 193 | |
| 194 | |
| 195 /* Create a new AVP instance */ | |
| 196 int fd_msg_avp_new ( struct dict_object * model, int flags, struct avp ** avp ) | |
| 197 { | |
| 198 struct avp *new = NULL; | |
| 199 | |
| 200 TRACE_ENTRY("%p %x %p", model, flags, avp); | |
| 201 | |
| 202 /* Check the parameters */ | |
|
638
9448cba86673
Improved usability of dbg_interactive
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
637
diff
changeset
|
203 CHECK_PARAMS( avp && CHECK_AVPFL(flags) ); |
| 0 | 204 |
| 205 if (model) { | |
| 206 enum dict_object_type dicttype; | |
| 207 CHECK_PARAMS( (fd_dict_gettype(model, &dicttype) == 0) && (dicttype == DICT_AVP) ); | |
| 208 } | |
| 209 | |
| 210 /* Create a new object */ | |
| 211 CHECK_MALLOC( new = malloc (sizeof(struct avp)) ); | |
| 212 | |
| 213 /* Initialize the fields */ | |
| 214 init_avp(new); | |
| 215 | |
| 216 if (model) { | |
| 217 struct dict_avp_data dictdata; | |
| 218 | |
| 219 CHECK_FCT( fd_dict_getval(model, &dictdata) ); | |
| 220 | |
| 221 new->avp_model = model; | |
| 222 new->avp_public.avp_code = dictdata.avp_code; | |
| 223 new->avp_public.avp_flags = dictdata.avp_flag_val; | |
| 224 new->avp_public.avp_len = GETINITIALSIZE(dictdata.avp_basetype, dictdata.avp_flag_val ); | |
| 225 new->avp_public.avp_vendor = dictdata.avp_vendor; | |
| 226 } | |
| 227 | |
|
638
9448cba86673
Improved usability of dbg_interactive
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
637
diff
changeset
|
228 if (flags & AVPFL_SET_BLANK_VALUE) { |
|
9448cba86673
Improved usability of dbg_interactive
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
637
diff
changeset
|
229 new->avp_public.avp_value = &new->avp_storage; |
|
9448cba86673
Improved usability of dbg_interactive
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
637
diff
changeset
|
230 } |
|
9448cba86673
Improved usability of dbg_interactive
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
637
diff
changeset
|
231 |
| 0 | 232 /* The new object is ready, return */ |
| 233 *avp = new; | |
| 234 return 0; | |
| 235 } | |
| 236 | |
| 237 /* Create a new message instance */ | |
| 238 int fd_msg_new ( struct dict_object * model, int flags, struct msg ** msg ) | |
| 239 { | |
| 240 struct msg * new = NULL; | |
| 241 | |
| 242 TRACE_ENTRY("%p %x %p", model, flags, msg); | |
| 243 | |
| 244 /* Check the parameters */ | |
| 245 CHECK_PARAMS( msg && CHECK_MSGFL(flags) ); | |
| 246 | |
| 247 if (model) { | |
| 248 enum dict_object_type dicttype; | |
| 249 CHECK_PARAMS( (fd_dict_gettype(model, &dicttype) == 0) && (dicttype == DICT_COMMAND) ); | |
| 250 } | |
| 251 | |
| 252 /* Create a new object */ | |
| 253 CHECK_MALLOC( new = malloc (sizeof(struct msg)) ); | |
| 254 | |
| 255 /* Initialize the fields */ | |
| 256 init_msg(new); | |
| 257 new->msg_public.msg_version = DIAMETER_VERSION; | |
| 258 new->msg_public.msg_length = GETMSGHDRSZ(); /* This will be updated later */ | |
| 259 | |
| 260 if (model) { | |
| 261 struct dictionary *dict; | |
| 262 struct dict_cmd_data dictdata; | |
| 263 struct dict_object *dictappl; | |
| 264 | |
| 265 CHECK_FCT( fd_dict_getdict(model, &dict) ); | |
| 266 CHECK_FCT( fd_dict_getval(model, &dictdata) ); | |
| 267 | |
| 268 new->msg_model = model; | |
| 269 new->msg_public.msg_flags = dictdata.cmd_flag_val; | |
| 270 new->msg_public.msg_code = dictdata.cmd_code; | |
| 271 | |
| 272 /* Initialize application from the parent, if any */ | |
| 273 CHECK_FCT( fd_dict_search( dict, DICT_APPLICATION, APPLICATION_OF_COMMAND, model, &dictappl, 0) ); | |
| 274 if (dictappl != NULL) { | |
| 275 struct dict_application_data appdata; | |
| 276 CHECK_FCT( fd_dict_getval(dictappl, &appdata) ); | |
| 277 new->msg_public.msg_appl = appdata.application_id; | |
| 278 } | |
| 279 } | |
| 280 | |
| 281 if (flags & MSGFL_ALLOC_ETEID) { | |
| 282 new->msg_public.msg_eteid = fd_msg_eteid_get(); | |
| 283 } | |
| 284 | |
| 285 /* The new object is ready, return */ | |
| 286 *msg = new; | |
| 287 return 0; | |
| 288 } | |
| 289 | |
| 290 /* Create answer from a request */ | |
| 291 int fd_msg_new_answer_from_req ( struct dictionary * dict, struct msg ** msg, int flags ) | |
| 292 { | |
| 293 struct dict_object * model = NULL; | |
| 294 struct msg *qry, *ans; | |
|
112
6a294d977878
Default to add Session-Id in answers
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
100
diff
changeset
|
295 struct session * sess = NULL; |
| 0 | 296 |
| 297 TRACE_ENTRY("%p %x", msg, flags); | |
| 298 | |
| 299 /* Check the parameters */ | |
| 300 CHECK_PARAMS( msg ); | |
| 301 qry = *msg; | |
| 302 CHECK_PARAMS( CHECK_MSG(qry) && (qry->msg_public.msg_flags & CMD_FLAG_REQUEST) ); | |
| 303 | |
|
112
6a294d977878
Default to add Session-Id in answers
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
100
diff
changeset
|
304 if (! (flags & MSGFL_ANSW_NOSID)) { |
|
6a294d977878
Default to add Session-Id in answers
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
100
diff
changeset
|
305 /* Get the session of the message */ |
|
6a294d977878
Default to add Session-Id in answers
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
100
diff
changeset
|
306 CHECK_FCT_DO( fd_msg_sess_get(dict, qry, &sess, NULL), /* ignore an error */ ); |
|
6a294d977878
Default to add Session-Id in answers
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
100
diff
changeset
|
307 } |
|
6a294d977878
Default to add Session-Id in answers
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
100
diff
changeset
|
308 |
| 0 | 309 /* Find the model for the answer */ |
| 310 if (flags & MSGFL_ANSW_ERROR) { | |
| 311 /* The model is the generic error format */ | |
| 312 CHECK_FCT( fd_dict_get_error_cmd(dict, &model) ); | |
| 313 } else { | |
| 314 /* The model is the answer corresponding to the query. It supposes that these are defined in the dictionary */ | |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
315 CHECK_FCT_DO( parsedict_do_msg( dict, qry, 1, NULL), /* continue */ ); |
| 0 | 316 if (qry->msg_model) { |
| 317 CHECK_FCT( fd_dict_search ( dict, DICT_COMMAND, CMD_ANSWER, qry->msg_model, &model, EINVAL ) ); | |
| 318 } | |
| 319 } | |
| 320 | |
| 321 /* Create the answer */ | |
| 322 CHECK_FCT( fd_msg_new( model, flags, &ans ) ); | |
| 323 | |
| 324 /* Set informations in the answer as in the query */ | |
| 325 ans->msg_public.msg_code = qry->msg_public.msg_code; /* useful for MSGFL_ANSW_ERROR */ | |
| 326 ans->msg_public.msg_appl = qry->msg_public.msg_appl; | |
| 327 ans->msg_public.msg_eteid = qry->msg_public.msg_eteid; | |
| 328 ans->msg_public.msg_hbhid = qry->msg_public.msg_hbhid; | |
| 329 | |
|
112
6a294d977878
Default to add Session-Id in answers
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
100
diff
changeset
|
330 /* Add the Session-Id AVP if session is known */ |
|
6a294d977878
Default to add Session-Id in answers
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
100
diff
changeset
|
331 if (sess && dict) { |
|
6a294d977878
Default to add Session-Id in answers
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
100
diff
changeset
|
332 struct dict_object * sess_id_avp; |
|
6a294d977878
Default to add Session-Id in answers
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
100
diff
changeset
|
333 char * sid; |
|
6a294d977878
Default to add Session-Id in answers
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
100
diff
changeset
|
334 struct avp * avp; |
|
6a294d977878
Default to add Session-Id in answers
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
100
diff
changeset
|
335 union avp_value val; |
|
6a294d977878
Default to add Session-Id in answers
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
100
diff
changeset
|
336 |
|
6a294d977878
Default to add Session-Id in answers
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
100
diff
changeset
|
337 CHECK_FCT( fd_dict_search( dict, DICT_AVP, AVP_BY_NAME, "Session-Id", &sess_id_avp, ENOENT) ); |
|
6a294d977878
Default to add Session-Id in answers
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
100
diff
changeset
|
338 CHECK_FCT( fd_sess_getsid ( sess, &sid ) ); |
|
6a294d977878
Default to add Session-Id in answers
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
100
diff
changeset
|
339 CHECK_FCT( fd_msg_avp_new ( sess_id_avp, 0, &avp ) ); |
|
400
bb8a4fa301b3
Fix compilation warning
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
387
diff
changeset
|
340 val.os.data = (unsigned char *)sid; |
|
112
6a294d977878
Default to add Session-Id in answers
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
100
diff
changeset
|
341 val.os.len = strlen(sid); |
|
6a294d977878
Default to add Session-Id in answers
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
100
diff
changeset
|
342 CHECK_FCT( fd_msg_avp_setvalue( avp, &val ) ); |
|
6a294d977878
Default to add Session-Id in answers
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
100
diff
changeset
|
343 CHECK_FCT( fd_msg_avp_add( ans, MSG_BRW_FIRST_CHILD, avp ) ); |
|
291
2d3a799ad29c
Cache the session pointer in answers when it was present in queries
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
280
diff
changeset
|
344 ans->msg_sess = sess; |
|
2d3a799ad29c
Cache the session pointer in answers when it was present in queries
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
280
diff
changeset
|
345 CHECK_FCT( fd_sess_ref_msg(sess) ); |
|
112
6a294d977878
Default to add Session-Id in answers
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
100
diff
changeset
|
346 } |
|
6a294d977878
Default to add Session-Id in answers
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
100
diff
changeset
|
347 |
| 0 | 348 /* associate with query */ |
| 349 ans->msg_query = qry; | |
|
637
22e8fac3b2d6
Split interface file in modules
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
400
diff
changeset
|
350 qry->msg_associated = 1; |
| 0 | 351 |
| 352 /* Done */ | |
| 353 *msg = ans; | |
| 354 return 0; | |
| 355 } | |
| 356 | |
| 357 /***************************************************************************************************************/ | |
| 358 | |
| 359 /* Explore a message */ | |
| 360 int fd_msg_browse_internal ( msg_or_avp * reference, enum msg_brw_dir dir, msg_or_avp ** found, int * depth ) | |
| 361 { | |
| 362 struct msg_avp_chain *result = NULL; | |
| 363 int diff = 0; | |
| 364 struct fd_list *li = NULL; | |
| 365 | |
| 366 TRACE_ENTRY("%p %d %p %p", reference, dir, found, depth); | |
| 367 | |
| 368 /* Initialize the "found" result if any */ | |
| 369 if (found) | |
| 370 *found = NULL; | |
| 371 | |
| 372 /* Check the parameters */ | |
| 373 CHECK_PARAMS( VALIDATE_OBJ(reference) ); | |
| 374 | |
| 375 TRACE_DEBUG(FCTS, "chaining(%p): nxt:%p prv:%p hea:%p top:%p", | |
| 376 &_C(reference)->chaining, | |
| 377 _C(reference)->chaining.next, | |
| 378 _C(reference)->chaining.prev, | |
| 379 _C(reference)->chaining.head, | |
| 380 _C(reference)->chaining.o); | |
| 381 TRACE_DEBUG(FCTS, "children(%p): nxt:%p prv:%p hea:%p top:%p", | |
| 382 &_C(reference)->children, | |
| 383 _C(reference)->children.next, | |
| 384 _C(reference)->children.prev, | |
| 385 _C(reference)->children.head, | |
| 386 _C(reference)->children.o); | |
| 387 | |
| 388 /* Now search */ | |
| 389 switch (dir) { | |
| 390 case MSG_BRW_NEXT: | |
| 391 /* Check the reference is an AVP */ | |
| 392 CHECK_PARAMS( _C(reference)->type == MSG_AVP ); | |
| 393 | |
| 394 li = &_C(reference)->chaining; | |
| 395 | |
| 396 /* Check if the next element is not the sentinel ( ==> the parent) */ | |
| 397 if (li->next != li->head) | |
| 398 result = _C(li->next->o); | |
| 399 break; | |
| 400 | |
| 401 case MSG_BRW_PREV: | |
| 402 /* Check the reference is an AVP */ | |
| 403 CHECK_PARAMS( _C(reference)->type == MSG_AVP ); | |
| 404 | |
| 405 li = &_C(reference)->chaining; | |
| 406 | |
| 407 /* Check if the prev element is not the sentinel ( ==> the parent) */ | |
| 408 if (li->prev != li->head) | |
| 409 result = _C(li->prev->o); | |
| 410 break; | |
| 411 | |
| 412 case MSG_BRW_FIRST_CHILD: | |
| 413 li = &_C(reference)->children; | |
| 414 if (! FD_IS_LIST_EMPTY(li)) { | |
| 415 result = _C(li->next->o); | |
| 416 diff = 1; | |
| 417 } | |
| 418 break; | |
| 419 | |
| 420 case MSG_BRW_LAST_CHILD: | |
| 421 li = &_C(reference)->children; | |
| 422 if (! FD_IS_LIST_EMPTY(li)) { | |
| 423 result = _C(li->prev->o); | |
| 424 diff = 1; | |
| 425 } | |
| 426 break; | |
| 427 | |
| 428 case MSG_BRW_PARENT: | |
| 429 /* If the object is not chained, it has no parent */ | |
| 430 li = &_C(reference)->chaining; | |
| 431 if (li != li->head) { | |
| 432 /* The sentinel is the parent's children list */ | |
| 433 result = _C(li->head->o); | |
| 434 diff = -1; | |
| 435 } | |
| 436 break; | |
| 437 | |
| 438 case MSG_BRW_WALK: | |
| 439 /* First, try to find a child */ | |
| 440 li = &_C(reference)->children; | |
| 441 if ( ! FD_IS_LIST_EMPTY(li) ) { | |
| 442 result = _C(li->next->o); | |
| 443 diff = 1; | |
| 444 break; | |
| 445 } | |
| 446 | |
| 447 /* Then try to find a "next" at this level or one of the parent's */ | |
| 448 li = &_C(reference)->chaining; | |
| 449 do { | |
| 450 /* If this element has a "next" element, return it */ | |
| 451 if (li->next != li->head) { | |
| 452 result = _C(li->next->o); | |
| 453 break; | |
| 454 } | |
| 455 /* otherwise, check if we have a parent */ | |
| 456 if (li == li->head) { | |
| 457 /* no parent */ | |
| 458 break; | |
| 459 } | |
| 460 /* Go to the parent's chaining information and loop */ | |
| 461 diff -= 1; | |
| 462 li = &_C(li->head->o)->chaining; | |
| 463 } while (1); | |
| 464 break; | |
| 465 | |
| 466 default: | |
| 467 /* Other directions are invalid */ | |
| 468 CHECK_PARAMS( dir = 0 ); | |
| 469 } | |
| 470 | |
| 471 /* Save the found object, if any */ | |
| 472 if (found && result) | |
| 473 *found = (void *)result; | |
| 474 | |
| 475 /* Modify the depth according to the walk direction */ | |
| 476 if (depth && diff) | |
| 477 (*depth) += diff; | |
| 478 | |
| 479 /* Return ENOENT if found was NULL */ | |
| 480 if ((!found) && (!result)) | |
| 481 return ENOENT; | |
| 482 else | |
| 483 return 0; | |
| 484 } | |
| 485 | |
| 486 /* Add an AVP into a tree */ | |
| 487 int fd_msg_avp_add ( msg_or_avp * reference, enum msg_brw_dir dir, struct avp *avp) | |
| 488 { | |
| 489 TRACE_ENTRY("%p %d %p", reference, dir, avp); | |
| 490 | |
| 491 /* Check the parameters */ | |
| 492 CHECK_PARAMS( VALIDATE_OBJ(reference) && CHECK_AVP(avp) && FD_IS_LIST_EMPTY(&avp->avp_chain.chaining) ); | |
| 493 | |
| 494 /* Now insert */ | |
| 495 switch (dir) { | |
| 496 case MSG_BRW_NEXT: | |
| 497 /* Check the reference is an AVP -- we do not chain AVPs at same level as msgs. */ | |
| 498 CHECK_PARAMS( _C(reference)->type == MSG_AVP ); | |
| 499 | |
| 500 /* Insert the new avp after the reference */ | |
| 501 fd_list_insert_after( &_A(reference)->avp_chain.chaining, &avp->avp_chain.chaining ); | |
| 502 break; | |
| 503 | |
| 504 case MSG_BRW_PREV: | |
| 505 /* Check the reference is an AVP */ | |
| 506 CHECK_PARAMS( _C(reference)->type == MSG_AVP ); | |
| 507 | |
| 508 /* Insert the new avp before the reference */ | |
| 509 fd_list_insert_before( &_A(reference)->avp_chain.chaining, &avp->avp_chain.chaining ); | |
| 510 break; | |
| 511 | |
| 512 case MSG_BRW_FIRST_CHILD: | |
| 513 /* Insert the new avp after the children sentinel */ | |
| 514 fd_list_insert_after( &_C(reference)->children, &avp->avp_chain.chaining ); | |
| 515 break; | |
| 516 | |
| 517 case MSG_BRW_LAST_CHILD: | |
| 518 /* Insert the new avp before the children sentinel */ | |
| 519 fd_list_insert_before( &_C(reference)->children, &avp->avp_chain.chaining ); | |
| 520 break; | |
| 521 | |
| 522 default: | |
| 523 /* Other directions are invalid */ | |
| 524 CHECK_PARAMS( dir = 0 ); | |
| 525 } | |
| 526 | |
| 527 return 0; | |
| 528 } | |
| 529 | |
| 530 /* Search a given AVP model in a message */ | |
| 531 int fd_msg_search_avp ( struct msg * msg, struct dict_object * what, struct avp ** avp ) | |
| 532 { | |
| 533 struct avp * nextavp; | |
| 534 struct dict_avp_data dictdata; | |
| 535 enum dict_object_type dicttype; | |
| 536 | |
| 537 TRACE_ENTRY("%p %p %p", msg, what, avp); | |
| 538 | |
| 539 CHECK_PARAMS( CHECK_MSG(msg) && what ); | |
| 540 | |
| 541 CHECK_PARAMS( (fd_dict_gettype(what, &dicttype) == 0) && (dicttype == DICT_AVP) ); | |
| 542 CHECK_FCT( fd_dict_getval(what, &dictdata) ); | |
| 543 | |
| 544 /* Loop on all top AVPs */ | |
| 545 CHECK_FCT( fd_msg_browse(msg, MSG_BRW_FIRST_CHILD, (void *)&nextavp, NULL) ); | |
| 546 while (nextavp) { | |
| 547 | |
| 548 if ( (nextavp->avp_public.avp_code == dictdata.avp_code) | |
| 549 && (nextavp->avp_public.avp_vendor == dictdata.avp_vendor) ) /* always 0 if no V flag */ | |
| 550 break; | |
| 551 | |
| 552 /* Otherwise move to next AVP in the message */ | |
| 553 CHECK_FCT( fd_msg_browse(nextavp, MSG_BRW_NEXT, (void *)&nextavp, NULL) ); | |
| 554 } | |
| 555 | |
| 556 if (avp) | |
| 557 *avp = nextavp; | |
| 558 | |
| 559 if (avp && nextavp) { | |
| 560 struct dictionary * dict; | |
| 561 CHECK_FCT( fd_dict_getdict( what, &dict) ); | |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
562 CHECK_FCT_DO( fd_msg_parse_dict( nextavp, dict, NULL ), /* nothing */ ); |
| 0 | 563 } |
| 564 | |
| 565 if (avp || nextavp) | |
| 566 return 0; | |
| 567 else | |
| 568 return ENOENT; | |
| 569 } | |
| 570 | |
| 571 | |
| 572 /***************************************************************************************************************/ | |
| 573 /* Deleting objects */ | |
| 574 | |
| 575 /* Destroy and free an AVP or message */ | |
| 576 static int destroy_obj (struct msg_avp_chain * obj ) | |
| 577 { | |
| 578 TRACE_ENTRY("%p", obj); | |
| 579 | |
| 580 /* Check the parameter is a valid object */ | |
| 581 CHECK_PARAMS( VALIDATE_OBJ(obj) && FD_IS_LIST_EMPTY( &obj->children ) ); | |
| 582 | |
| 583 /* Unlink this object if needed */ | |
| 584 fd_list_unlink( &obj->chaining ); | |
| 585 | |
| 586 /* Free the octetstring if needed */ | |
| 587 if ((obj->type == MSG_AVP) && (_A(obj)->avp_mustfreeos == 1)) { | |
| 588 free(_A(obj)->avp_storage.os.data); | |
| 589 } | |
| 590 /* Free the rawdata if needed */ | |
| 591 if ((obj->type == MSG_AVP) && (_A(obj)->avp_rawdata != NULL)) { | |
| 592 free(_A(obj)->avp_rawdata); | |
| 593 } | |
| 594 if ((obj->type == MSG_MSG) && (_M(obj)->msg_rawbuffer != NULL)) { | |
| 595 free(_M(obj)->msg_rawbuffer); | |
| 596 } | |
| 597 | |
| 598 if ((obj->type == MSG_MSG) && (_M(obj)->msg_src_id != NULL)) { | |
| 599 free(_M(obj)->msg_src_id); | |
| 600 } | |
| 601 | |
|
83
c662d3eb6ff6
Started support for routing module
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
37
diff
changeset
|
602 if ((obj->type == MSG_MSG) && (_M(obj)->msg_rtdata != NULL)) { |
|
c662d3eb6ff6
Started support for routing module
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
37
diff
changeset
|
603 fd_rtd_free(&_M(obj)->msg_rtdata); |
| 0 | 604 } |
| 605 | |
|
85
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
606 if ((obj->type == MSG_MSG) && (_M(obj)->msg_sess != NULL)) { |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
607 CHECK_FCT_DO( fd_sess_reclaim_msg ( &_M(obj)->msg_sess ), /* continue */); |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
608 } |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
609 |
| 0 | 610 /* free the object */ |
| 611 free(obj); | |
| 612 | |
| 613 return 0; | |
| 614 } | |
| 615 | |
| 616 /* Destroy an object and all its children */ | |
| 617 static void destroy_tree(struct msg_avp_chain * obj) | |
| 618 { | |
| 619 struct fd_list *rem; | |
| 620 | |
| 621 TRACE_ENTRY("%p", obj); | |
| 622 | |
| 623 /* Destroy any subtree */ | |
| 624 while ( (rem = obj->children.next) != &obj->children) | |
| 625 destroy_tree(_C(rem->o)); | |
| 626 | |
| 627 /* Then unlink and destroy the object */ | |
| 628 CHECK_FCT_DO( destroy_obj(obj), /* nothing */ ); | |
| 629 } | |
| 630 | |
| 631 /* Free an object and its tree */ | |
| 632 int fd_msg_free ( msg_or_avp * object ) | |
| 633 { | |
| 634 TRACE_ENTRY("%p", object); | |
| 635 | |
| 636 if (CHECK_MSG(object)) { | |
| 637 if (_M(object)->msg_query) { | |
|
637
22e8fac3b2d6
Split interface file in modules
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
400
diff
changeset
|
638 _M(_M(object)->msg_query)->msg_associated = 0; |
| 0 | 639 CHECK_FCT( fd_msg_free( _M(object)->msg_query ) ); |
| 640 _M(object)->msg_query = NULL; | |
|
637
22e8fac3b2d6
Split interface file in modules
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
400
diff
changeset
|
641 } else { |
|
22e8fac3b2d6
Split interface file in modules
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
400
diff
changeset
|
642 if (_M(object)->msg_associated) { |
|
22e8fac3b2d6
Split interface file in modules
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
400
diff
changeset
|
643 TRACE_DEBUG(INFO, "Not freeing query %p referenced in an answer (will be freed along the answer).", object); |
|
22e8fac3b2d6
Split interface file in modules
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
400
diff
changeset
|
644 return 0; |
|
22e8fac3b2d6
Split interface file in modules
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
400
diff
changeset
|
645 } |
| 0 | 646 } |
| 647 } | |
| 648 | |
| 649 destroy_tree(_C(object)); | |
| 650 return 0; | |
| 651 } | |
| 652 | |
| 653 | |
| 654 /***************************************************************************************************************/ | |
| 655 /* Debug functions: dumping */ | |
| 656 | |
| 657 /* indent inside an object */ | |
| 658 #define INOBJHDR "%*s " | |
| 659 #define INOBJHDRVAL indent<0 ? 1 : indent, indent<0 ? "-" : "|" | |
| 660 | |
| 661 /* Dump a msg_t object */ | |
| 662 static void obj_dump_msg (struct msg * msg, int indent ) | |
| 663 { | |
| 664 int ret = 0; | |
| 665 | |
| 666 fd_log_debug("%*sMSG: %p\n", INOBJHDRVAL, msg); | |
| 667 | |
| 668 if (!CHECK_MSG(msg)) { | |
| 669 fd_log_debug(INOBJHDR "INVALID!\n", INOBJHDRVAL); | |
| 670 return; | |
| 671 } | |
| 672 | |
| 673 if (!msg->msg_model) { | |
| 674 | |
| 675 fd_log_debug(INOBJHDR "(no model)\n", INOBJHDRVAL); | |
| 676 | |
| 677 } else { | |
| 678 | |
| 679 enum dict_object_type dicttype; | |
| 680 struct dict_cmd_data dictdata; | |
| 681 ret = fd_dict_gettype(msg->msg_model, &dicttype); | |
| 682 if (ret || (dicttype != DICT_COMMAND)) { | |
| 683 fd_log_debug(INOBJHDR "(invalid model: %d %d)\n", INOBJHDRVAL, ret, dicttype); | |
| 684 goto public; | |
| 685 } | |
| 686 ret = fd_dict_getval(msg->msg_model, &dictdata); | |
| 687 if (ret != 0) { | |
| 688 fd_log_debug(INOBJHDR "(error getting model data: %s)\n", INOBJHDRVAL, strerror(ret)); | |
| 689 goto public; | |
| 690 } | |
| 691 fd_log_debug(INOBJHDR "model : v/m:" DUMP_CMDFL_str "/" DUMP_CMDFL_str ", %u \"%s\"\n", INOBJHDRVAL, | |
| 692 DUMP_CMDFL_val(dictdata.cmd_flag_val), DUMP_CMDFL_val(dictdata.cmd_flag_mask), dictdata.cmd_code, dictdata.cmd_name); | |
| 693 } | |
| 694 public: | |
| 695 fd_log_debug(INOBJHDR "public: V:%d L:%d fl:" DUMP_CMDFL_str " CC:%u A:%d hi:%x ei:%x\n", INOBJHDRVAL, | |
| 696 msg->msg_public.msg_version, | |
| 697 msg->msg_public.msg_length, | |
| 698 DUMP_CMDFL_val(msg->msg_public.msg_flags), | |
| 699 msg->msg_public.msg_code, | |
| 700 msg->msg_public.msg_appl, | |
| 701 msg->msg_public.msg_hbhid, | |
| 702 msg->msg_public.msg_eteid | |
| 703 ); | |
|
637
22e8fac3b2d6
Split interface file in modules
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
400
diff
changeset
|
704 fd_log_debug(INOBJHDR "intern: rwb:%p rt:%d cb:%p(%p) qry:%p asso:%d sess:%p src:%s\n", |
|
22e8fac3b2d6
Split interface file in modules
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
400
diff
changeset
|
705 INOBJHDRVAL, msg->msg_rawbuffer, msg->msg_routable, msg->msg_cb.fct, msg->msg_cb.data, msg->msg_query, msg->msg_associated, msg->msg_sess, msg->msg_src_id?:"(nil)"); |
| 0 | 706 } |
| 707 | |
| 708 /* Dump an avp object */ | |
| 709 static void obj_dump_avp ( struct avp * avp, int indent ) | |
| 710 { | |
| 711 int ret = 0; | |
| 712 enum dict_avp_basetype type = -1; | |
| 713 | |
| 714 if (!CHECK_AVP(avp)) { | |
| 715 fd_log_debug(INOBJHDR "INVALID!\n", INOBJHDRVAL); | |
| 716 return; | |
| 717 } | |
| 718 | |
| 719 if (!avp->avp_model) { | |
| 720 | |
| 721 fd_log_debug(INOBJHDR "(no model)\n", INOBJHDRVAL); | |
| 722 | |
| 723 } else { | |
| 724 | |
| 725 enum dict_object_type dicttype; | |
| 726 struct dict_avp_data dictdata; | |
| 727 ret = fd_dict_gettype(avp->avp_model, &dicttype); | |
| 728 if (ret || (dicttype != DICT_AVP)) { | |
| 729 fd_log_debug(INOBJHDR "(invalid model: %d %d)\n", INOBJHDRVAL, ret, dicttype); | |
| 730 goto public; | |
| 731 } | |
| 732 ret = fd_dict_getval(avp->avp_model, &dictdata); | |
| 733 if (ret != 0) { | |
| 734 fd_log_debug(INOBJHDR "(error getting model data: %s)\n", INOBJHDRVAL, strerror(ret)); | |
| 735 goto public; | |
| 736 } | |
| 737 fd_log_debug(INOBJHDR "model : v/m:" DUMP_AVPFL_str "/" DUMP_AVPFL_str ", %12s, %u \"%s\"\n", INOBJHDRVAL, | |
| 738 DUMP_AVPFL_val(dictdata.avp_flag_val), | |
| 739 DUMP_AVPFL_val(dictdata.avp_flag_mask), | |
| 740 type_base_name[dictdata.avp_basetype], | |
| 741 dictdata.avp_code, | |
| 742 dictdata.avp_name ); | |
| 743 type = dictdata.avp_basetype; | |
| 744 } | |
| 745 public: | |
| 746 fd_log_debug(INOBJHDR "public: C:%u fl:" DUMP_AVPFL_str " L:%d V:%u data:@%p\n", INOBJHDRVAL, | |
| 747 avp->avp_public.avp_code, | |
| 748 DUMP_AVPFL_val(avp->avp_public.avp_flags), | |
| 749 avp->avp_public.avp_len, | |
| 750 avp->avp_public.avp_vendor, | |
| 751 avp->avp_public.avp_value | |
| 752 ); | |
| 753 /* Dump the value if set */ | |
| 754 if (avp->avp_public.avp_value) { | |
| 755 if (!avp->avp_model) { | |
| 756 fd_log_debug(INOBJHDR "(data set but no model: ERROR)\n", INOBJHDRVAL); | |
| 757 } else { | |
|
156
e2dc300819b3
Fix overwriten thread location
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
132
diff
changeset
|
758 fd_dict_dump_avp_value(avp->avp_public.avp_value, avp->avp_model, indent); |
| 0 | 759 } |
| 760 } | |
|
400
bb8a4fa301b3
Fix compilation warning
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
387
diff
changeset
|
761 |
| 0 | 762 fd_log_debug(INOBJHDR "intern: src:%p mf:%d raw:%p(%d)\n", INOBJHDRVAL, avp->avp_source, avp->avp_mustfreeos, avp->avp_rawdata, avp->avp_rawlen); |
| 763 } | |
| 764 | |
| 765 /* Dump a single object content */ | |
| 766 static void msg_dump_intern ( int level, msg_or_avp * obj, int indent ) | |
| 767 { | |
| 768 /* Log only if we are at least at level */ | |
| 769 if ( ! TRACE_BOOL(level) ) | |
| 770 return; | |
| 771 | |
| 772 /* Check the object */ | |
| 773 if (!VALIDATE_OBJ(obj)) { | |
| 774 fd_log_debug( ">>> invalid object (%p)!.\n", obj); | |
| 775 return; | |
| 776 } | |
| 777 | |
| 778 /* Dump the object */ | |
| 779 switch (_C(obj)->type) { | |
| 780 case MSG_AVP: | |
| 781 obj_dump_avp ( _A(obj), indent ); | |
| 782 break; | |
| 783 | |
| 784 case MSG_MSG: | |
| 785 obj_dump_msg ( _M(obj), indent ); | |
| 786 break; | |
| 787 | |
| 788 default: | |
| 789 ASSERT(0); | |
| 790 } | |
| 791 } | |
| 792 | |
| 793 /* Dump a message content -- for debug mostly */ | |
| 794 void fd_msg_dump_walk ( int level, msg_or_avp *obj ) | |
| 795 { | |
| 796 msg_or_avp * ref = obj; | |
| 797 int indent = 1; | |
| 798 | |
| 799 TRACE_DEBUG(level, "------ Dumping object %p (w)-------", obj); | |
| 800 do { | |
| 801 msg_dump_intern ( level, ref, indent ); | |
| 802 | |
| 803 /* Now find the next object */ | |
| 804 CHECK_FCT_DO( fd_msg_browse ( ref, MSG_BRW_WALK, &ref, &indent ), break ); | |
| 805 | |
| 806 /* dump next object */ | |
| 807 } while (ref); | |
| 808 | |
| 809 TRACE_DEBUG(level, "------ /end of object %p -------", obj); | |
| 810 } | |
| 811 | |
| 812 /* Dump a single object content -- for debug mostly */ | |
| 813 void fd_msg_dump_one ( int level, msg_or_avp * obj ) | |
| 814 { | |
| 815 TRACE_DEBUG(level, "------ Dumping object %p (s)-------", obj); | |
| 816 msg_dump_intern ( level, obj, 1 ); | |
| 817 TRACE_DEBUG(level, "------ /end of object %p -------", obj); | |
| 818 } | |
| 819 | |
| 820 | |
| 821 /***************************************************************************************************************/ | |
| 822 /* Simple meta-data management */ | |
| 823 | |
| 824 /* Retrieve the model of an object */ | |
| 825 int fd_msg_model ( msg_or_avp * reference, struct dict_object ** model ) | |
| 826 { | |
| 827 TRACE_ENTRY("%p %p", reference, model); | |
| 828 | |
| 829 /* Check the parameters */ | |
| 830 CHECK_PARAMS( model && VALIDATE_OBJ(reference) ); | |
| 831 | |
| 832 /* copy the model reference */ | |
| 833 switch (_C(reference)->type) { | |
| 834 case MSG_AVP: | |
| 835 *model = _A(reference)->avp_model; | |
| 836 break; | |
| 837 | |
| 838 case MSG_MSG: | |
| 839 *model = _M(reference)->msg_model; | |
| 840 break; | |
| 841 | |
| 842 default: | |
| 843 CHECK_PARAMS(0); | |
| 844 } | |
| 845 | |
| 846 return 0; | |
| 847 } | |
| 848 | |
| 849 /* Retrieve the address of the msg_public field of a message */ | |
| 850 int fd_msg_hdr ( struct msg *msg, struct msg_hdr **pdata ) | |
| 851 { | |
| 852 TRACE_ENTRY("%p %p", msg, pdata); | |
| 853 CHECK_PARAMS( CHECK_MSG(msg) && pdata ); | |
| 854 | |
| 855 *pdata = &msg->msg_public; | |
| 856 return 0; | |
| 857 } | |
| 858 | |
| 859 /* Retrieve the address of the avp_public field of an avp */ | |
| 860 int fd_msg_avp_hdr ( struct avp *avp, struct avp_hdr **pdata ) | |
| 861 { | |
| 862 TRACE_ENTRY("%p %p", avp, pdata); | |
| 863 CHECK_PARAMS( CHECK_AVP(avp) && pdata ); | |
| 864 | |
| 865 *pdata = &avp->avp_public; | |
| 866 return 0; | |
| 867 } | |
| 868 | |
| 869 /* Associate answers and queries */ | |
| 870 int fd_msg_answ_associate( struct msg * answer, struct msg * query ) | |
| 871 { | |
| 872 TRACE_ENTRY( "%p %p", answer, query ); | |
| 873 | |
| 874 CHECK_PARAMS( CHECK_MSG(answer) && CHECK_MSG(query) && (answer->msg_query == NULL ) ); | |
| 875 | |
| 876 answer->msg_query = query; | |
|
637
22e8fac3b2d6
Split interface file in modules
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
400
diff
changeset
|
877 query->msg_associated = 1; |
| 0 | 878 |
| 879 return 0; | |
| 880 } | |
| 881 | |
| 882 int fd_msg_answ_getq( struct msg * answer, struct msg ** query ) | |
| 883 { | |
| 884 TRACE_ENTRY( "%p %p", answer, query ); | |
| 885 | |
| 886 CHECK_PARAMS( CHECK_MSG(answer) && query ); | |
| 887 | |
| 888 *query = answer->msg_query; | |
| 889 | |
| 890 return 0; | |
| 891 } | |
| 892 | |
| 893 int fd_msg_answ_detach( struct msg * answer ) | |
| 894 { | |
| 895 TRACE_ENTRY( "%p", answer ); | |
| 896 | |
| 897 CHECK_PARAMS( CHECK_MSG(answer) ); | |
| 898 | |
|
637
22e8fac3b2d6
Split interface file in modules
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
400
diff
changeset
|
899 answer->msg_query->msg_associated = 0; |
| 0 | 900 answer->msg_query = NULL; |
| 901 | |
| 902 return 0; | |
| 903 } | |
| 904 | |
| 905 /* Associate / get answer callbacks */ | |
| 906 int fd_msg_anscb_associate( struct msg * msg, void ( *anscb)(void *, struct msg **), void * data ) | |
| 907 { | |
| 908 TRACE_ENTRY("%p %p %p", msg, anscb, data); | |
| 909 | |
| 910 /* Check the parameters */ | |
| 911 CHECK_PARAMS( CHECK_MSG(msg) && anscb ); | |
| 100 | 912 CHECK_PARAMS( msg->msg_public.msg_flags & CMD_FLAG_REQUEST ); /* we associate with requests only */ |
| 0 | 913 CHECK_PARAMS( msg->msg_cb.fct == NULL ); /* No cb is already registered */ |
| 914 | |
| 915 /* Associate callback and data with the message, if any */ | |
| 916 msg->msg_cb.fct = anscb; | |
| 917 msg->msg_cb.data = data; | |
| 918 | |
| 919 return 0; | |
| 920 } | |
| 921 | |
| 922 int fd_msg_anscb_get( struct msg * msg, void (**anscb)(void *, struct msg **), void ** data ) | |
| 923 { | |
| 924 TRACE_ENTRY("%p %p %p", msg, anscb, data); | |
| 925 | |
| 926 /* Check the parameters */ | |
| 927 CHECK_PARAMS( CHECK_MSG(msg) && anscb && data ); | |
| 928 | |
| 929 /* Copy the result */ | |
| 930 *anscb = msg->msg_cb.fct; | |
| 931 *data = msg->msg_cb.data; | |
| 932 | |
| 933 return 0; | |
| 934 } | |
| 935 | |
| 936 /* Associate routing lists */ | |
|
83
c662d3eb6ff6
Started support for routing module
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
37
diff
changeset
|
937 int fd_msg_rt_associate( struct msg * msg, struct rt_data ** rtd ) |
| 0 | 938 { |
|
83
c662d3eb6ff6
Started support for routing module
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
37
diff
changeset
|
939 TRACE_ENTRY( "%p %p", msg, rtd ); |
| 0 | 940 |
|
83
c662d3eb6ff6
Started support for routing module
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
37
diff
changeset
|
941 CHECK_PARAMS( CHECK_MSG(msg) && rtd ); |
| 0 | 942 |
|
83
c662d3eb6ff6
Started support for routing module
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
37
diff
changeset
|
943 msg->msg_rtdata = *rtd; |
|
c662d3eb6ff6
Started support for routing module
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
37
diff
changeset
|
944 *rtd = NULL; |
| 0 | 945 |
| 946 return 0; | |
| 947 } | |
| 948 | |
|
83
c662d3eb6ff6
Started support for routing module
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
37
diff
changeset
|
949 int fd_msg_rt_get( struct msg * msg, struct rt_data ** rtd ) |
| 0 | 950 { |
|
83
c662d3eb6ff6
Started support for routing module
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
37
diff
changeset
|
951 TRACE_ENTRY( "%p %p", msg, rtd ); |
| 0 | 952 |
|
83
c662d3eb6ff6
Started support for routing module
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
37
diff
changeset
|
953 CHECK_PARAMS( CHECK_MSG(msg) && rtd ); |
| 0 | 954 |
|
83
c662d3eb6ff6
Started support for routing module
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
37
diff
changeset
|
955 *rtd = msg->msg_rtdata; |
|
c662d3eb6ff6
Started support for routing module
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
37
diff
changeset
|
956 msg->msg_rtdata = NULL; |
| 0 | 957 |
| 958 return 0; | |
| 959 } | |
| 960 | |
| 961 /* Find if a message is routable */ | |
| 962 int fd_msg_is_routable ( struct msg * msg ) | |
| 963 { | |
| 964 TRACE_ENTRY("%p", msg); | |
| 965 | |
| 966 CHECK_PARAMS_DO( CHECK_MSG(msg), return 0 /* pretend the message is not routable */ ); | |
| 967 | |
| 968 if ( ! msg->msg_routable ) { | |
|
37
cc3c59fe98fe
Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
35
diff
changeset
|
969 /* To define if a message is routable, we rely on the "PXY" flag (for application 0). */ |
|
cc3c59fe98fe
Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
35
diff
changeset
|
970 msg->msg_routable = ((msg->msg_public.msg_appl != 0) || (msg->msg_public.msg_flags & CMD_FLAG_PROXIABLE)) ? 1 : 2; |
| 0 | 971 |
| 972 /* Note : the 'real' criteria according to the Diameter I-D is that the message is | |
| 973 routable if and only if the "Destination-Realm" AVP is required by the command ABNF. | |
| 974 We could make a test for this here, but it's more computational work and our test | |
| 975 seems accurate (until proven otherwise...) */ | |
| 976 } | |
| 977 | |
| 978 return (msg->msg_routable == 1) ? 1 : 0; | |
| 979 } | |
| 980 | |
| 981 /* Associate source peer */ | |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
982 int fd_msg_source_set( struct msg * msg, char * diamid, int add_rr, struct dictionary * dict ) |
| 0 | 983 { |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
984 TRACE_ENTRY( "%p %p %d %p", msg, diamid, add_rr, dict); |
| 0 | 985 |
| 986 /* Check we received a valid message */ | |
| 987 CHECK_PARAMS( CHECK_MSG(msg) && dict ); | |
| 988 | |
| 989 /* Cleanup any previous source */ | |
| 990 free(msg->msg_src_id); msg->msg_src_id = NULL; | |
| 991 | |
| 992 /* If the request is to cleanup the source, we are done */ | |
| 993 if (diamid == NULL) { | |
| 994 return 0; | |
| 995 } | |
| 996 | |
| 997 /* Otherwise save the new informations */ | |
| 998 CHECK_MALLOC( msg->msg_src_id = strdup(diamid) ); | |
| 999 | |
| 1000 if (add_rr) { | |
| 1001 struct dict_object *avp_rr_model; | |
| 1002 avp_code_t code = AC_ROUTE_RECORD; | |
| 1003 struct avp *avp; | |
| 1004 union avp_value val; | |
| 1005 | |
| 1006 /* Find the model for Route-Record in the dictionary */ | |
| 1007 CHECK_FCT( fd_dict_search ( dict, DICT_AVP, AVP_BY_CODE, &code, &avp_rr_model, ENOENT) ); | |
| 1008 | |
| 1009 /* Create the AVP with this model */ | |
| 1010 CHECK_FCT( fd_msg_avp_new ( avp_rr_model, 0, &avp ) ); | |
| 1011 | |
| 1012 /* Set the AVP value with the diameter id */ | |
| 1013 memset(&val, 0, sizeof(val)); | |
| 1014 val.os.data = (unsigned char *)diamid; | |
| 1015 val.os.len = strlen(diamid); | |
| 1016 CHECK_FCT( fd_msg_avp_setvalue( avp, &val ) ); | |
| 1017 | |
| 1018 /* Add the AVP in the message */ | |
| 1019 CHECK_FCT( fd_msg_avp_add( msg, MSG_BRW_LAST_CHILD, avp ) ); | |
| 1020 } | |
| 1021 | |
| 1022 /* done */ | |
| 1023 return 0; | |
| 1024 } | |
| 1025 | |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1026 int fd_msg_source_get( struct msg * msg, char ** diamid ) |
| 0 | 1027 { |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1028 TRACE_ENTRY( "%p %p", msg, diamid); |
| 0 | 1029 |
| 1030 /* Check we received valid parameters */ | |
| 1031 CHECK_PARAMS( CHECK_MSG(msg) ); | |
| 1032 CHECK_PARAMS( diamid ); | |
| 1033 | |
| 1034 /* Copy the informations */ | |
| 1035 *diamid = msg->msg_src_id; | |
| 1036 | |
| 1037 /* done */ | |
| 1038 return 0; | |
| 1039 } | |
| 1040 | |
|
85
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1041 /* Retrieve the session of the message */ |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1042 int fd_msg_sess_get(struct dictionary * dict, struct msg * msg, struct session ** session, int * new) |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1043 { |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1044 struct avp * avp; |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1045 |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1046 TRACE_ENTRY("%p %p %p", msg, session, new); |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1047 |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1048 /* Check we received valid parameters */ |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1049 CHECK_PARAMS( CHECK_MSG(msg) ); |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1050 CHECK_PARAMS( session ); |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1051 |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1052 /* If we already resolved the session, just send it back */ |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1053 if (msg->msg_sess) { |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1054 *session = msg->msg_sess; |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1055 if (new) |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1056 *new = 0; |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1057 return 0; |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1058 } |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1059 |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1060 /* OK, we have to search for Session-Id AVP -- it is usually the first AVP, but let's be permissive here */ |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1061 /* -- note: we accept messages that have not yet been dictionary parsed... */ |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1062 CHECK_FCT( fd_msg_browse(msg, MSG_BRW_FIRST_CHILD, &avp, NULL) ); |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1063 while (avp) { |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1064 if ( (avp->avp_public.avp_code == AC_SESSION_ID) |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1065 && (avp->avp_public.avp_vendor == 0) ) |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1066 break; |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1067 |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1068 /* Otherwise move to next AVP in the message */ |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1069 CHECK_FCT( fd_msg_browse(avp, MSG_BRW_NEXT, &avp, NULL) ); |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1070 } |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1071 |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1072 if (!avp) { |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1073 TRACE_DEBUG(FULL, "No Session-Id AVP found in message %p", msg); |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1074 *session = NULL; |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1075 return 0; |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1076 } |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1077 |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1078 if (!avp->avp_model) { |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1079 CHECK_FCT( fd_msg_parse_dict ( avp, dict, NULL ) ); |
|
85
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1080 } |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1081 |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1082 ASSERT( avp->avp_public.avp_value ); |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1083 |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1084 /* Resolve the session and we are done */ |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1085 CHECK_FCT( fd_sess_fromsid_msg ( avp->avp_public.avp_value->os.data, avp->avp_public.avp_value->os.len, &msg->msg_sess, new) ); |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1086 *session = msg->msg_sess; |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1087 |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1088 return 0; |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1089 } |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1090 |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1091 |
| 0 | 1092 /******************* End-to-end counter *********************/ |
| 1093 uint32_t fd_eteid; | |
| 1094 pthread_mutex_t fd_eteid_lck = PTHREAD_MUTEX_INITIALIZER; | |
| 1095 | |
| 1096 void fd_msg_eteid_init(void) | |
| 1097 { | |
| 1098 fd_eteid = ((uint32_t)time(NULL) << 20) | ((uint32_t)lrand48() & ( (1 << 20) - 1 )); | |
| 1099 } | |
| 1100 | |
| 1101 uint32_t fd_msg_eteid_get ( void ) | |
| 1102 { | |
| 1103 uint32_t ret; | |
| 1104 | |
| 1105 CHECK_POSIX_DO( pthread_mutex_lock(&fd_eteid_lck), /* continue */ ); | |
| 1106 | |
| 1107 ret = fd_eteid ++; | |
| 1108 | |
| 1109 CHECK_POSIX_DO( pthread_mutex_unlock(&fd_eteid_lck), /* continue */ ); | |
| 1110 | |
| 1111 return ret; | |
| 1112 } | |
| 1113 | |
| 1114 /***************************************************************************************************************/ | |
| 1115 /* Manage AVPs values */ | |
| 1116 | |
| 1117 /* Set the value of an AVP */ | |
| 1118 int fd_msg_avp_setvalue ( struct avp *avp, union avp_value *value ) | |
| 1119 { | |
| 1120 enum dict_avp_basetype type = -1; | |
| 1121 | |
| 1122 TRACE_ENTRY("%p %p", avp, value); | |
| 1123 | |
| 1124 /* Check parameter */ | |
| 1125 CHECK_PARAMS( CHECK_AVP(avp) && avp->avp_model ); | |
| 1126 | |
| 1127 /* Retrieve information from the AVP model */ | |
| 1128 { | |
| 1129 enum dict_object_type dicttype; | |
| 1130 struct dict_avp_data dictdata; | |
| 1131 | |
| 1132 CHECK_PARAMS( (fd_dict_gettype(avp->avp_model, &dicttype) == 0) && (dicttype == DICT_AVP) ); | |
| 1133 CHECK_FCT( fd_dict_getval(avp->avp_model, &dictdata) ); | |
| 1134 type = dictdata.avp_basetype; | |
| 1135 CHECK_PARAMS( type != AVP_TYPE_GROUPED ); | |
| 1136 } | |
| 1137 | |
| 1138 /* First, clean any previous value */ | |
| 1139 if (avp->avp_mustfreeos != 0) { | |
| 1140 free(avp->avp_storage.os.data); | |
| 1141 avp->avp_mustfreeos = 0; | |
| 1142 } | |
| 1143 | |
| 1144 memset(&avp->avp_storage, 0, sizeof(union avp_value)); | |
| 1145 | |
| 1146 /* If the request was to delete a value: */ | |
| 1147 if (!value) { | |
| 1148 avp->avp_public.avp_value = NULL; | |
| 1149 return 0; | |
| 1150 } | |
| 1151 | |
| 1152 /* Now we have to set the value */ | |
| 1153 memcpy(&avp->avp_storage, value, sizeof(union avp_value)); | |
| 1154 | |
| 1155 /* Copy an octetstring if needed. */ | |
|
387
743195485eec
Additional fixes for empty octet string AVPs
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
386
diff
changeset
|
1156 if (type == AVP_TYPE_OCTETSTRING) { |
|
743195485eec
Additional fixes for empty octet string AVPs
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
386
diff
changeset
|
1157 if (value->os.len) { |
|
743195485eec
Additional fixes for empty octet string AVPs
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
386
diff
changeset
|
1158 CHECK_MALLOC( avp->avp_storage.os.data = malloc(value->os.len) ); |
|
743195485eec
Additional fixes for empty octet string AVPs
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
386
diff
changeset
|
1159 avp->avp_mustfreeos = 1; |
|
743195485eec
Additional fixes for empty octet string AVPs
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
386
diff
changeset
|
1160 memcpy(avp->avp_storage.os.data, value->os.data, value->os.len); |
|
743195485eec
Additional fixes for empty octet string AVPs
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
386
diff
changeset
|
1161 } else { |
|
743195485eec
Additional fixes for empty octet string AVPs
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
386
diff
changeset
|
1162 avp->avp_storage.os.data = NULL; |
|
743195485eec
Additional fixes for empty octet string AVPs
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
386
diff
changeset
|
1163 } |
| 0 | 1164 } |
| 1165 | |
| 1166 /* Set the data pointer of the public part */ | |
| 1167 avp->avp_public.avp_value = &avp->avp_storage; | |
| 1168 | |
| 1169 return 0; | |
| 1170 } | |
| 1171 | |
| 1172 /* Set the value of an AVP, using formatted data */ | |
| 1173 int fd_msg_avp_value_encode ( void *data, struct avp *avp ) | |
| 1174 { | |
| 1175 enum dict_avp_basetype type = -1; | |
| 1176 struct dict_type_data type_data; | |
| 1177 | |
| 1178 TRACE_ENTRY("%p %p", data, avp); | |
| 1179 | |
| 1180 /* Check parameter */ | |
| 1181 CHECK_PARAMS( CHECK_AVP(avp) && avp->avp_model ); | |
| 1182 | |
| 1183 /* Retrieve information from the AVP model and it's parent type */ | |
| 1184 { | |
| 1185 enum dict_object_type dicttype; | |
| 1186 struct dict_avp_data dictdata; | |
| 1187 struct dictionary * dict; | |
| 1188 struct dict_object * parenttype = NULL; | |
| 1189 | |
| 1190 /* First check the base type of the AVP */ | |
| 1191 CHECK_PARAMS( (fd_dict_gettype(avp->avp_model, &dicttype) == 0) && (dicttype == DICT_AVP) ); | |
| 1192 CHECK_FCT( fd_dict_getval(avp->avp_model, &dictdata) ); | |
| 1193 type = dictdata.avp_basetype; | |
| 1194 CHECK_PARAMS( type != AVP_TYPE_GROUPED ); | |
| 1195 | |
| 1196 /* Then retrieve information about the parent's type (= derived type) */ | |
| 1197 CHECK_FCT( fd_dict_getdict( avp->avp_model, &dict ) ); | |
| 1198 CHECK_FCT( fd_dict_search( dict, DICT_TYPE, TYPE_OF_AVP, avp->avp_model, &parenttype, EINVAL) ); | |
| 1199 CHECK_FCT( fd_dict_getval(parenttype, &type_data) ); | |
| 1200 if (type_data.type_encode == NULL) { | |
| 1201 TRACE_DEBUG(INFO, "This AVP type does not provide a callback to encode formatted data. ENOTSUP."); | |
| 1202 return ENOTSUP; | |
| 1203 } | |
| 1204 } | |
| 1205 | |
| 1206 /* Ok, now we can encode the value */ | |
| 1207 | |
| 1208 /* First, clean any previous value */ | |
| 1209 if (avp->avp_mustfreeos != 0) { | |
| 1210 free(avp->avp_storage.os.data); | |
| 1211 avp->avp_mustfreeos = 0; | |
| 1212 } | |
| 1213 avp->avp_public.avp_value = NULL; | |
| 1214 memset(&avp->avp_storage, 0, sizeof(union avp_value)); | |
| 1215 | |
| 1216 /* Now call the type's callback to encode the data */ | |
| 1217 CHECK_FCT( (*type_data.type_encode)(data, &avp->avp_storage) ); | |
| 1218 | |
| 1219 /* If an octetstring has been allocated, let's mark it to be freed */ | |
| 1220 if (type == AVP_TYPE_OCTETSTRING) | |
| 1221 avp->avp_mustfreeos = 1; | |
| 1222 | |
| 1223 /* Set the data pointer of the public part */ | |
| 1224 avp->avp_public.avp_value = &avp->avp_storage; | |
| 1225 | |
| 1226 return 0; | |
| 1227 } | |
| 1228 | |
| 1229 /* Interpret the value of an AVP into formatted data */ | |
| 1230 int fd_msg_avp_value_interpret ( struct avp *avp, void *data ) | |
| 1231 { | |
| 1232 struct dict_type_data type_data; | |
| 1233 | |
| 1234 TRACE_ENTRY("%p %p", avp, data); | |
| 1235 | |
| 1236 /* Check parameter */ | |
| 1237 CHECK_PARAMS( CHECK_AVP(avp) && avp->avp_model && avp->avp_public.avp_value ); | |
| 1238 | |
| 1239 /* Retrieve information about the AVP parent type */ | |
| 1240 { | |
| 1241 struct dictionary * dict; | |
| 1242 struct dict_object * parenttype = NULL; | |
| 1243 | |
| 1244 CHECK_FCT( fd_dict_getdict( avp->avp_model, &dict ) ); | |
| 1245 CHECK_FCT( fd_dict_search( dict, DICT_TYPE, TYPE_OF_AVP, avp->avp_model, &parenttype, EINVAL) ); | |
| 1246 CHECK_FCT( fd_dict_getval(parenttype, &type_data) ); | |
| 1247 if (type_data.type_interpret == NULL) { | |
| 1248 TRACE_DEBUG(INFO, "This AVP type does not provide a callback to interpret value in formatted data. ENOTSUP."); | |
| 1249 return ENOTSUP; | |
| 1250 } | |
| 1251 } | |
| 1252 | |
| 1253 /* Ok, now we can interpret the value */ | |
| 1254 | |
| 1255 CHECK_FCT( (*type_data.type_interpret)(avp->avp_public.avp_value, data) ); | |
| 1256 | |
| 1257 return 0; | |
| 1258 } | |
| 1259 | |
| 1260 /***************************************************************************************************************/ | |
| 1261 /* Creating a buffer from memory objects (bufferize a struct msg) */ | |
| 1262 | |
| 1263 /* Following macros are used to store 32 and 64 bit fields into a buffer in network byte order */ | |
| 1264 #define PUT_in_buf_32( _u32data, _bufptr ) { \ | |
| 1265 *(uint32_t *)(_bufptr) = htonl((uint32_t)(_u32data)); \ | |
| 1266 } | |
| 1267 #define PUT_in_buf_64( _u64data, _bufptr ) { \ | |
| 1268 *(uint64_t *)(_bufptr) = htonll((uint64_t)(_u64data)); \ | |
| 1269 } | |
| 1270 | |
| 1271 /* Write a message header in the buffer */ | |
| 1272 static int bufferize_msg(unsigned char * buffer, size_t buflen, size_t * offset, struct msg * msg) | |
| 1273 { | |
| 1274 TRACE_ENTRY("%p %d %p %p", buffer, buflen, offset, msg); | |
| 1275 | |
| 1276 if ((buflen - *offset) < GETMSGHDRSZ()) | |
| 1277 return ENOSPC; | |
| 1278 | |
| 1279 if (*offset & 0x3) | |
| 1280 return EFAULT; /* We are supposed to start on 32 bit boundaries */ | |
| 1281 | |
| 1282 PUT_in_buf_32(msg->msg_public.msg_length, buffer + *offset); | |
| 1283 buffer[*offset] = msg->msg_public.msg_version; | |
| 1284 *offset += 4; | |
| 1285 | |
| 1286 PUT_in_buf_32(msg->msg_public.msg_code, buffer + *offset); | |
| 1287 buffer[*offset] = msg->msg_public.msg_flags; | |
| 1288 *offset += 4; | |
| 1289 | |
| 1290 PUT_in_buf_32(msg->msg_public.msg_appl, buffer + *offset); | |
| 1291 *offset += 4; | |
| 1292 | |
| 1293 PUT_in_buf_32(msg->msg_public.msg_hbhid, buffer + *offset); | |
| 1294 *offset += 4; | |
| 1295 | |
| 1296 PUT_in_buf_32(msg->msg_public.msg_eteid, buffer + *offset); | |
| 1297 *offset += 4; | |
| 1298 | |
| 1299 return 0; | |
| 1300 } | |
| 1301 | |
| 1302 static int bufferize_chain(unsigned char * buffer, size_t buflen, size_t * offset, struct fd_list * list); | |
| 1303 | |
| 1304 /* Write an AVP in the buffer */ | |
| 1305 static int bufferize_avp(unsigned char * buffer, size_t buflen, size_t * offset, struct avp * avp) | |
| 1306 { | |
| 1307 struct dict_avp_data dictdata; | |
| 1308 | |
| 1309 TRACE_ENTRY("%p %d %p %p", buffer, buflen, offset, avp); | |
| 1310 | |
| 1311 if ((buflen - *offset) < avp->avp_public.avp_len) | |
| 1312 return ENOSPC; | |
| 1313 | |
| 1314 /* Write the header */ | |
| 1315 PUT_in_buf_32(avp->avp_public.avp_code, buffer + *offset); | |
| 1316 *offset += 4; | |
| 1317 | |
| 1318 PUT_in_buf_32(avp->avp_public.avp_len, buffer + *offset); | |
| 1319 buffer[*offset] = avp->avp_public.avp_flags; | |
| 1320 *offset += 4; | |
| 1321 | |
| 1322 if (avp->avp_public.avp_flags & AVP_FLAG_VENDOR) { | |
| 1323 PUT_in_buf_32(avp->avp_public.avp_vendor, buffer + *offset); | |
| 1324 *offset += 4; | |
| 1325 } | |
| 1326 | |
| 1327 /* Then we must write the AVP value */ | |
| 1328 | |
| 1329 if (avp->avp_model == NULL) { | |
| 1330 /* In the case where we don't know the type of AVP, just copy the raw data or source */ | |
| 1331 CHECK_PARAMS( avp->avp_source || avp->avp_rawdata ); | |
| 1332 | |
| 1333 if ( avp->avp_source != NULL ) { | |
| 1334 /* the message was not parsed completely */ | |
| 1335 size_t datalen = avp->avp_public.avp_len - GETAVPHDRSZ(avp->avp_public.avp_flags); | |
| 1336 memcpy(&buffer[*offset], avp->avp_source, datalen); | |
| 1337 *offset += PAD4(datalen); | |
| 1338 } else { | |
| 1339 /* the content was stored in rawdata */ | |
| 1340 memcpy(&buffer[*offset], avp->avp_rawdata, avp->avp_rawlen); | |
| 1341 *offset += PAD4(avp->avp_rawlen); | |
| 1342 } | |
| 1343 | |
| 1344 } else { | |
| 1345 /* The AVP is defined in the dictionary */ | |
| 1346 CHECK_FCT( fd_dict_getval(avp->avp_model, &dictdata) ); | |
| 1347 | |
| 1348 CHECK_PARAMS( ( dictdata.avp_basetype == AVP_TYPE_GROUPED ) || avp->avp_public.avp_value ); | |
| 1349 | |
| 1350 switch (dictdata.avp_basetype) { | |
| 1351 case AVP_TYPE_GROUPED: | |
| 1352 return bufferize_chain(buffer, buflen, offset, &avp->avp_chain.children); | |
| 1353 | |
| 1354 case AVP_TYPE_OCTETSTRING: | |
|
387
743195485eec
Additional fixes for empty octet string AVPs
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
386
diff
changeset
|
1355 if (avp->avp_public.avp_value->os.len) |
|
743195485eec
Additional fixes for empty octet string AVPs
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
386
diff
changeset
|
1356 memcpy(&buffer[*offset], avp->avp_public.avp_value->os.data, avp->avp_public.avp_value->os.len); |
| 0 | 1357 *offset += PAD4(avp->avp_public.avp_value->os.len); |
| 1358 break; | |
| 1359 | |
| 1360 case AVP_TYPE_INTEGER32: | |
| 1361 PUT_in_buf_32(avp->avp_public.avp_value->i32, buffer + *offset); | |
| 1362 *offset += 4; | |
| 1363 break; | |
| 1364 | |
| 1365 case AVP_TYPE_INTEGER64: | |
| 1366 PUT_in_buf_64(avp->avp_public.avp_value->i64, buffer + *offset); | |
| 1367 *offset += 8; | |
| 1368 break; | |
| 1369 | |
| 1370 case AVP_TYPE_UNSIGNED32: | |
| 1371 PUT_in_buf_32(avp->avp_public.avp_value->u32, buffer + *offset); | |
| 1372 *offset += 4; | |
| 1373 break; | |
| 1374 | |
| 1375 case AVP_TYPE_UNSIGNED64: | |
| 1376 PUT_in_buf_64(avp->avp_public.avp_value->u64, buffer + *offset); | |
| 1377 *offset += 8; | |
| 1378 break; | |
| 1379 | |
| 1380 case AVP_TYPE_FLOAT32: | |
| 1381 /* We read the f32 as "u32" here to avoid casting to uint make decimals go away. | |
| 1382 The alternative would be something like "*(uint32_t *)(& f32)" but | |
| 1383 then the compiler complains about strict-aliasing rules. */ | |
| 1384 PUT_in_buf_32(avp->avp_public.avp_value->u32, buffer + *offset); | |
| 1385 *offset += 4; | |
| 1386 break; | |
| 1387 | |
| 1388 case AVP_TYPE_FLOAT64: | |
| 1389 /* Same remark as previously */ | |
| 1390 PUT_in_buf_64(avp->avp_public.avp_value->u64, buffer + *offset); | |
| 1391 *offset += 8; | |
| 1392 break; | |
| 1393 | |
| 1394 default: | |
| 1395 ASSERT(0); | |
| 1396 } | |
| 1397 } | |
| 1398 return 0; | |
| 1399 } | |
| 1400 | |
| 1401 /* Write a chain of AVPs in the buffer */ | |
| 1402 static int bufferize_chain(unsigned char * buffer, size_t buflen, size_t * offset, struct fd_list * list) | |
| 1403 { | |
| 1404 struct fd_list * avpch; | |
| 1405 | |
| 1406 TRACE_ENTRY("%p %d %p %p", buffer, buflen, offset, list); | |
| 1407 | |
| 1408 for (avpch = list->next; avpch != list; avpch = avpch->next) { | |
| 1409 /* Bufferize the AVP */ | |
| 1410 CHECK_FCT( bufferize_avp(buffer, buflen, offset, _A(avpch->o)) ); | |
| 1411 } | |
| 1412 return 0; | |
| 1413 } | |
| 1414 | |
| 1415 /* Create the message buffer, in network-byte order. We browse the tree twice, this could be probably improved if needed */ | |
| 1416 int fd_msg_bufferize ( struct msg * msg, unsigned char ** buffer, size_t * len ) | |
| 1417 { | |
| 1418 int ret = 0; | |
| 1419 unsigned char * buf = NULL; | |
| 1420 size_t offset = 0; | |
| 1421 | |
| 1422 TRACE_ENTRY("%p %p %p", msg, buffer, len); | |
| 1423 | |
| 1424 /* Check the parameters */ | |
| 1425 CHECK_PARAMS( buffer && CHECK_MSG(msg) ); | |
| 1426 | |
| 1427 /* Update the length. This also checks that all AVP have their values set */ | |
| 1428 CHECK_FCT( fd_msg_update_length(msg) ); | |
| 1429 | |
| 1430 /* Now allocate a buffer to store the message */ | |
| 1431 CHECK_MALLOC( buf = malloc(msg->msg_public.msg_length) ); | |
| 1432 | |
| 1433 /* Clear the memory, so that the padding is always 0 (should not matter) */ | |
| 1434 memset(buf, 0, msg->msg_public.msg_length); | |
| 1435 | |
| 1436 /* Write the message header in the buffer */ | |
| 1437 CHECK_FCT_DO( ret = bufferize_msg(buf, msg->msg_public.msg_length, &offset, msg), | |
| 1438 { | |
| 1439 free(buf); | |
| 1440 return ret; | |
| 1441 } ); | |
| 1442 | |
| 1443 /* Write the list of AVPs */ | |
| 1444 CHECK_FCT_DO( ret = bufferize_chain(buf, msg->msg_public.msg_length, &offset, &msg->msg_chain.children), | |
| 1445 { | |
| 1446 free(buf); | |
| 1447 return ret; | |
| 1448 } ); | |
| 1449 | |
| 1450 ASSERT(offset == msg->msg_public.msg_length); /* or the msg_update_length is buggy */ | |
| 1451 | |
| 1452 if (len) { | |
| 1453 *len = offset; | |
| 1454 } | |
| 1455 | |
| 1456 *buffer = buf; | |
| 1457 return 0; | |
| 1458 } | |
| 1459 | |
| 1460 | |
| 1461 /***************************************************************************************************************/ | |
| 1462 /* Parsing buffers and building AVP objects lists (not parsing the AVP values which requires dictionary knowledge) */ | |
| 1463 | |
| 1464 /* Parse a buffer containing a supposed list of AVPs */ | |
| 1465 static int parsebuf_list(unsigned char * buf, size_t buflen, struct fd_list * head) | |
| 1466 { | |
| 1467 size_t offset = 0; | |
| 1468 | |
| 1469 TRACE_ENTRY("%p %d %p", buf, buflen, head); | |
| 1470 | |
| 1471 while (offset < buflen) { | |
| 1472 struct avp * avp; | |
| 1473 | |
| 1474 if (buflen - offset <= AVPHDRSZ_NOVEND) { | |
| 1475 TRACE_DEBUG(INFO, "truncated buffer: remaining only %d bytes", buflen - offset); | |
| 1476 return EBADMSG; | |
| 1477 } | |
| 1478 | |
| 1479 /* Create a new AVP object */ | |
| 1480 CHECK_MALLOC( avp = malloc (sizeof(struct avp)) ); | |
| 1481 | |
| 1482 init_avp(avp); | |
| 1483 | |
| 1484 /* Initialize the header */ | |
| 1485 avp->avp_public.avp_code = ntohl(*(uint32_t *)(buf + offset)); | |
| 1486 avp->avp_public.avp_flags = buf[offset + 4]; | |
| 1487 avp->avp_public.avp_len = ((uint32_t)buf[offset+5]) << 16 | ((uint32_t)buf[offset+6]) << 8 | ((uint32_t)buf[offset+7]) ; | |
| 1488 | |
| 1489 offset += 8; | |
| 1490 | |
| 1491 if (avp->avp_public.avp_flags & AVP_FLAG_VENDOR) { | |
| 1492 if (buflen - offset <= 4) { | |
| 1493 TRACE_DEBUG(INFO, "truncated buffer: remaining only %d bytes for vendor and data", buflen - offset); | |
| 1494 free(avp); | |
| 1495 return EBADMSG; | |
| 1496 } | |
| 1497 avp->avp_public.avp_vendor = ntohl(*(uint32_t *)(buf + offset)); | |
| 1498 offset += 4; | |
| 1499 } | |
| 1500 | |
| 1501 /* Check there is enough remaining data in the buffer */ | |
| 1502 if (buflen - offset < avp->avp_public.avp_len - GETAVPHDRSZ(avp->avp_public.avp_flags)) { | |
| 1503 TRACE_DEBUG(INFO, "truncated buffer: remaining only %d bytes for data, and avp data size is %d", | |
| 1504 buflen - offset, | |
| 1505 avp->avp_public.avp_len - GETAVPHDRSZ(avp->avp_public.avp_flags)); | |
| 1506 free(avp); | |
| 1507 return EBADMSG; | |
| 1508 } | |
| 1509 | |
| 1510 /* buf[offset] is now the beginning of the data */ | |
| 1511 avp->avp_source = &buf[offset]; | |
| 1512 | |
| 1513 /* Now eat the data and eventual padding */ | |
| 1514 offset += PAD4(avp->avp_public.avp_len - GETAVPHDRSZ(avp->avp_public.avp_flags)); | |
| 1515 | |
| 1516 /* And insert this avp in the list, at the end */ | |
| 1517 fd_list_insert_before( head, &avp->avp_chain.chaining ); | |
| 1518 } | |
| 1519 | |
| 1520 return 0; | |
| 1521 } | |
| 1522 | |
| 1523 /* Create a message object from a buffer. Dictionary objects are not resolved, AVP contents are not interpreted, buffer is saved in msg */ | |
| 1524 int fd_msg_parse_buffer ( unsigned char ** buffer, size_t buflen, struct msg ** msg ) | |
| 1525 { | |
| 1526 struct msg * new = NULL; | |
| 1527 int ret = 0; | |
| 1528 uint32_t msglen = 0; | |
| 1529 unsigned char * buf; | |
| 1530 | |
| 1531 TRACE_ENTRY("%p %d %p", buffer, buflen, msg); | |
| 1532 | |
| 1533 CHECK_PARAMS( buffer && *buffer && msg && (buflen >= GETMSGHDRSZ()) ); | |
| 1534 buf = *buffer; | |
| 1535 *buffer = NULL; | |
| 1536 | |
| 1537 if ( buf[0] != DIAMETER_VERSION) { | |
| 1538 TRACE_DEBUG(INFO, "Invalid version in message: %d (supported: %d)", buf[0], DIAMETER_VERSION); | |
| 1539 free(buf); | |
| 1540 return EBADMSG; | |
| 1541 } | |
| 1542 | |
| 1543 msglen = ntohl(*(uint32_t *)buf) & 0x00ffffff; | |
| 1544 if ( buflen < msglen ) { | |
| 1545 TRACE_DEBUG(INFO, "Truncated message (%d / %d)", buflen, msglen ); | |
| 1546 free(buf); | |
| 1547 return EBADMSG; | |
| 1548 } | |
| 1549 | |
| 1550 /* Create a new object */ | |
| 1551 CHECK_MALLOC_DO( new = malloc (sizeof(struct msg)), { free(buf); return ENOMEM; } ); | |
| 1552 | |
| 1553 /* Initialize the fields */ | |
| 1554 init_msg(new); | |
| 1555 | |
| 1556 /* Now read from the buffer */ | |
| 1557 new->msg_public.msg_version = buf[0]; | |
| 1558 new->msg_public.msg_length = msglen; | |
| 1559 | |
| 1560 new->msg_public.msg_flags = buf[4]; | |
| 1561 new->msg_public.msg_code = ntohl(*(uint32_t *)(buf+4)) & 0x00ffffff; | |
| 1562 | |
| 1563 new->msg_public.msg_appl = ntohl(*(uint32_t *)(buf+8)); | |
| 1564 new->msg_public.msg_hbhid = ntohl(*(uint32_t *)(buf+12)); | |
| 1565 new->msg_public.msg_eteid = ntohl(*(uint32_t *)(buf+16)); | |
| 1566 | |
| 1567 new->msg_rawbuffer = buf; | |
| 1568 | |
| 1569 /* Parse the AVP list */ | |
| 1570 CHECK_FCT_DO( ret = parsebuf_list(buf + GETMSGHDRSZ(), buflen - GETMSGHDRSZ(), &new->msg_chain.children), { destroy_tree(_C(new)); return ret; } ); | |
| 1571 | |
| 1572 *msg = new; | |
| 1573 return 0; | |
| 1574 } | |
| 1575 | |
| 1576 | |
| 1577 /***************************************************************************************************************/ | |
| 1578 /* Parsing messages and AVP with dictionary information */ | |
| 1579 | |
| 1580 /* Resolve dictionary objects of the cmd and avp instances, from their headers. | |
| 1581 * When the model is found, the data is interpreted from the avp_source buffer and copied to avp_storage. | |
| 1582 * When the model is not found, the data is copied as rawdata and saved (in case we FW the message). | |
| 1583 * Therefore, after this function has been called, the source buffer can be freed. | |
| 1584 * For command, if the dictionary model is not found, an error is returned. | |
| 1585 */ | |
| 1586 | |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1587 static int parsedict_do_chain(struct dictionary * dict, struct fd_list * head, int mandatory, struct fd_pei *error_info); |
| 0 | 1588 |
| 1589 /* Process an AVP. If we are not in recheck, the avp_source must be set. */ | |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1590 static int parsedict_do_avp(struct dictionary * dict, struct avp * avp, int mandatory, struct fd_pei *error_info) |
| 0 | 1591 { |
| 1592 struct dict_avp_data dictdata; | |
| 1593 | |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1594 TRACE_ENTRY("%p %p %d %p", dict, avp, mandatory, error_info); |
| 0 | 1595 |
| 1596 /* First check we received an AVP as input */ | |
| 1597 CHECK_PARAMS( CHECK_AVP(avp) ); | |
| 1598 | |
| 1599 if (avp->avp_model != NULL) { | |
| 1600 /* the model has already been resolved. we do check it is still valid */ | |
| 1601 | |
| 1602 CHECK_FCT( fd_dict_getval(avp->avp_model, &dictdata) ); | |
| 1603 | |
| 1604 if ( avp->avp_public.avp_code == dictdata.avp_code ) { | |
| 1605 /* Ok then just process the children if any */ | |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1606 return parsedict_do_chain(dict, &avp->avp_chain.children, mandatory && (avp->avp_public.avp_flags & AVP_FLAG_MANDATORY), error_info); |
| 0 | 1607 } else { |
| 1608 /* We just erase the old model */ | |
| 1609 avp->avp_model = NULL; | |
| 1610 } | |
| 1611 } | |
| 1612 | |
| 1613 /* Now try and resolve the model from the avp code and vendor */ | |
| 1614 if (avp->avp_public.avp_flags & AVP_FLAG_VENDOR) { | |
| 1615 struct dict_avp_request avpreq; | |
| 1616 avpreq.avp_vendor = avp->avp_public.avp_vendor; | |
| 1617 avpreq.avp_code = avp->avp_public.avp_code; | |
| 1618 CHECK_FCT( fd_dict_search ( dict, DICT_AVP, AVP_BY_CODE_AND_VENDOR, &avpreq, &avp->avp_model, 0)); | |
| 1619 } else { | |
| 1620 /* no vendor */ | |
| 1621 CHECK_FCT( fd_dict_search ( dict, DICT_AVP, AVP_BY_CODE, &avp->avp_public.avp_code, &avp->avp_model, 0)); | |
| 1622 } | |
| 1623 | |
| 1624 /* First handle the case where we have not found this AVP in the dictionary */ | |
| 1625 if (!avp->avp_model) { | |
| 1626 | |
| 1627 if (mandatory && (avp->avp_public.avp_flags & AVP_FLAG_MANDATORY)) { | |
| 1628 TRACE_DEBUG(INFO, "Unsupported mandatory AVP found:"); | |
| 1629 msg_dump_intern(INFO, avp, 2); | |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1630 if (error_info) { |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1631 error_info->pei_errcode = "DIAMETER_AVP_UNSUPPORTED"; |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1632 error_info->pei_avp = avp; |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1633 } |
| 0 | 1634 return ENOTSUP; |
| 1635 } | |
| 1636 | |
| 1637 if (avp->avp_source) { | |
| 1638 /* we must copy the data from the source to the internal buffer area */ | |
| 1639 CHECK_PARAMS( !avp->avp_rawdata ); | |
| 1640 | |
| 1641 avp->avp_rawlen = avp->avp_public.avp_len - GETAVPHDRSZ( avp->avp_public.avp_flags ); | |
| 1642 | |
|
387
743195485eec
Additional fixes for empty octet string AVPs
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
386
diff
changeset
|
1643 if (avp->avp_rawlen) { |
|
743195485eec
Additional fixes for empty octet string AVPs
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
386
diff
changeset
|
1644 CHECK_MALLOC( avp->avp_rawdata = malloc(avp->avp_rawlen) ); |
| 0 | 1645 |
|
387
743195485eec
Additional fixes for empty octet string AVPs
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
386
diff
changeset
|
1646 memcpy(avp->avp_rawdata, avp->avp_source, avp->avp_rawlen); |
|
743195485eec
Additional fixes for empty octet string AVPs
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
386
diff
changeset
|
1647 } |
|
743195485eec
Additional fixes for empty octet string AVPs
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
386
diff
changeset
|
1648 |
| 0 | 1649 avp->avp_source = NULL; |
| 1650 | |
| 1651 TRACE_DEBUG(FULL, "Unsupported optional AVP found, raw source data saved in avp_rawdata."); | |
| 1652 } | |
| 1653 | |
| 1654 return 0; | |
| 1655 } | |
| 1656 | |
| 1657 /* Ok we have resolved the object. Now we need to interpret its content. */ | |
| 1658 | |
| 1659 CHECK_FCT( fd_dict_getval(avp->avp_model, &dictdata) ); | |
| 1660 | |
| 1661 if (avp->avp_rawdata) { | |
| 1662 /* This happens if the dictionary object was defined after the first check */ | |
| 1663 avp->avp_source = avp->avp_rawdata; | |
| 1664 } | |
| 1665 | |
| 1666 /* A bit of sanity here... */ | |
| 1667 ASSERT(CHECK_BASETYPE(dictdata.avp_basetype)); | |
| 1668 | |
| 1669 /* Check the size is valid */ | |
| 1670 if ((avp_value_sizes[dictdata.avp_basetype] != 0) && | |
| 1671 (avp->avp_public.avp_len - GETAVPHDRSZ( avp->avp_public.avp_flags ) != avp_value_sizes[dictdata.avp_basetype])) { | |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1672 TRACE_DEBUG(INFO, "The AVP size is not suitable for the type."); |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1673 if (error_info) { |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1674 error_info->pei_errcode = "DIAMETER_INVALID_AVP_LENGTH"; |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1675 error_info->pei_avp = avp; |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1676 } |
| 0 | 1677 return EBADMSG; |
| 1678 } | |
| 1679 | |
| 1680 /* Now get the value inside */ | |
| 1681 switch (dictdata.avp_basetype) { | |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1682 case AVP_TYPE_GROUPED: { |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1683 int ret; |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1684 |
| 0 | 1685 /* This is a grouped AVP, so let's parse the list of AVPs inside */ |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1686 CHECK_FCT_DO( ret = parsebuf_list(avp->avp_source, avp->avp_public.avp_len - GETAVPHDRSZ( avp->avp_public.avp_flags ), &avp->avp_chain.children), |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1687 { |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1688 if ((ret == EBADMSG) && (error_info)) { |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1689 error_info->pei_errcode = "DIAMETER_INVALID_AVP_VALUE"; |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1690 error_info->pei_avp = avp; |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1691 } |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1692 return ret; |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1693 } ); |
| 0 | 1694 |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1695 return parsedict_do_chain(dict, &avp->avp_chain.children, mandatory && (avp->avp_public.avp_flags & AVP_FLAG_MANDATORY), error_info); |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1696 } |
| 0 | 1697 |
| 1698 case AVP_TYPE_OCTETSTRING: | |
| 1699 /* We just have to copy the string into the storage area */ | |
|
387
743195485eec
Additional fixes for empty octet string AVPs
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
386
diff
changeset
|
1700 CHECK_PARAMS_DO( avp->avp_public.avp_len >= GETAVPHDRSZ( avp->avp_public.avp_flags ), |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1701 { |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1702 if (error_info) { |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1703 error_info->pei_errcode = "DIAMETER_INVALID_AVP_LENGTH"; |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1704 error_info->pei_avp = avp; |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1705 } |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1706 return EBADMSG; |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1707 } ); |
| 0 | 1708 avp->avp_storage.os.len = avp->avp_public.avp_len - GETAVPHDRSZ( avp->avp_public.avp_flags ); |
|
387
743195485eec
Additional fixes for empty octet string AVPs
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
386
diff
changeset
|
1709 if (avp->avp_storage.os.len) { |
|
743195485eec
Additional fixes for empty octet string AVPs
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
386
diff
changeset
|
1710 CHECK_MALLOC( avp->avp_storage.os.data = malloc(avp->avp_storage.os.len) ); |
|
743195485eec
Additional fixes for empty octet string AVPs
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
386
diff
changeset
|
1711 avp->avp_mustfreeos = 1; |
|
743195485eec
Additional fixes for empty octet string AVPs
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
386
diff
changeset
|
1712 memcpy(avp->avp_storage.os.data, avp->avp_source, avp->avp_storage.os.len); |
|
743195485eec
Additional fixes for empty octet string AVPs
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
386
diff
changeset
|
1713 } else { |
|
743195485eec
Additional fixes for empty octet string AVPs
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
386
diff
changeset
|
1714 avp->avp_storage.os.data = NULL; |
|
743195485eec
Additional fixes for empty octet string AVPs
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
386
diff
changeset
|
1715 } |
| 0 | 1716 break; |
| 1717 | |
| 1718 case AVP_TYPE_INTEGER32: | |
| 1719 avp->avp_storage.i32 = (int32_t)ntohl(*(uint32_t *)avp->avp_source); | |
| 1720 break; | |
| 1721 | |
| 1722 case AVP_TYPE_INTEGER64: | |
| 1723 avp->avp_storage.i64 = (int64_t)ntohll(*(uint64_t *)avp->avp_source); | |
| 1724 break; | |
| 1725 | |
| 1726 case AVP_TYPE_UNSIGNED32: | |
| 1727 case AVP_TYPE_FLOAT32: /* For float, we must not cast, or the value is changed. Instead we use implicit cast by changing the member of the union */ | |
| 1728 avp->avp_storage.u32 = (uint32_t)ntohl(*(uint32_t *)avp->avp_source); | |
| 1729 break; | |
| 1730 | |
| 1731 case AVP_TYPE_UNSIGNED64: | |
| 1732 case AVP_TYPE_FLOAT64: /* same as 32 bits */ | |
| 1733 avp->avp_storage.u64 = (uint64_t)ntohll(*(uint64_t *)avp->avp_source); | |
| 1734 break; | |
| 1735 | |
| 1736 } | |
| 1737 | |
| 1738 /* The value is now set, so set the data pointer and return 0 */ | |
| 1739 avp->avp_public.avp_value = &avp->avp_storage; | |
| 1740 return 0; | |
| 1741 } | |
| 1742 | |
| 1743 /* Process a list of AVPs */ | |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1744 static int parsedict_do_chain(struct dictionary * dict, struct fd_list * head, int mandatory, struct fd_pei *error_info) |
| 0 | 1745 { |
| 1746 struct fd_list * avpch; | |
| 1747 | |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1748 TRACE_ENTRY("%p %p %d %p", dict, head, mandatory, error_info); |
| 0 | 1749 |
| 1750 /* Sanity check */ | |
| 1751 ASSERT ( head == head->head ); | |
| 1752 | |
| 1753 /* Now process the list */ | |
| 1754 for (avpch=head->next; avpch != head; avpch = avpch->next) { | |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1755 CHECK_FCT( parsedict_do_avp(dict, _A(avpch->o), mandatory, error_info) ); |
| 0 | 1756 } |
| 1757 | |
| 1758 /* Done */ | |
| 1759 return 0; | |
| 1760 } | |
| 1761 | |
| 1762 /* Process a msg header. */ | |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1763 static int parsedict_do_msg(struct dictionary * dict, struct msg * msg, int only_hdr, struct fd_pei *error_info) |
| 0 | 1764 { |
| 1765 int ret = 0; | |
| 1766 | |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1767 TRACE_ENTRY("%p %p %d %p", dict, msg, only_hdr, error_info); |
| 0 | 1768 |
| 1769 CHECK_PARAMS( CHECK_MSG(msg) ); | |
| 1770 | |
| 1771 /* Look for the model from the header */ | |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1772 CHECK_FCT_DO( ret = fd_dict_search ( dict, DICT_COMMAND, |
| 0 | 1773 (msg->msg_public.msg_flags & CMD_FLAG_REQUEST) ? CMD_BY_CODE_R : CMD_BY_CODE_A, |
| 1774 &msg->msg_public.msg_code, | |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1775 &msg->msg_model, ENOTSUP), |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1776 { |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1777 if ((ret == ENOTSUP) && (error_info)) { |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1778 error_info->pei_errcode = "DIAMETER_COMMAND_UNSUPPORTED"; |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1779 error_info->pei_protoerr = 1; |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1780 } |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1781 return ret; |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1782 } ); |
| 0 | 1783 |
| 1784 if (!only_hdr) { | |
| 1785 /* Then process the children */ | |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1786 ret = parsedict_do_chain(dict, &msg->msg_chain.children, 1, error_info); |
| 0 | 1787 |
| 1788 /* Free the raw buffer if any */ | |
| 1789 if ((ret == 0) && (msg->msg_rawbuffer != NULL)) { | |
| 1790 free(msg->msg_rawbuffer); | |
| 1791 msg->msg_rawbuffer=NULL; | |
| 1792 } | |
| 1793 } | |
| 1794 | |
| 1795 return ret; | |
| 1796 } | |
| 1797 | |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1798 int fd_msg_parse_dict ( msg_or_avp * object, struct dictionary * dict, struct fd_pei *error_info ) |
| 0 | 1799 { |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1800 TRACE_ENTRY("%p %p %p", dict, object, error_info); |
| 0 | 1801 |
| 1802 CHECK_PARAMS( VALIDATE_OBJ(object) ); | |
| 1803 | |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1804 if (error_info) |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1805 memset(error_info, 0, sizeof(struct fd_pei)); |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1806 |
| 0 | 1807 switch (_C(object)->type) { |
| 1808 case MSG_MSG: | |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1809 return parsedict_do_msg(dict, _M(object), 0, error_info); |
| 0 | 1810 |
| 1811 case MSG_AVP: | |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1812 return parsedict_do_avp(dict, _A(object), 0, error_info); |
| 0 | 1813 |
| 1814 default: | |
| 1815 ASSERT(0); | |
| 1816 } | |
| 1817 return EINVAL; | |
| 1818 } | |
| 1819 | |
| 1820 /***************************************************************************************************************/ | |
| 1821 /* Parsing messages and AVP for rules (ABNF) compliance */ | |
| 1822 | |
| 1823 /* This function is used to get stats (first occurence position, last occurence position, number of occurences) | |
| 1824 of AVP instances of a given model in a chain of AVP */ | |
| 1825 static void parserules_stat_avps( struct dict_object * model_avp, struct fd_list *list, int * count, int * firstpos, int * lastpos) | |
| 1826 { | |
| 1827 struct fd_list * li; | |
| 1828 int curpos = 0; /* The current position in the list */ | |
| 1829 | |
| 1830 TRACE_ENTRY("%p %p %p %p %p", model_avp, list, count, firstpos, lastpos); | |
| 1831 | |
| 1832 *count = 0; /* number of instances found */ | |
| 1833 *firstpos = 0; /* position of the first instance */ | |
| 1834 *lastpos = 0; /* position of the last instance, starting from the end */ | |
| 1835 | |
| 1836 for (li = list->next; li != list; li = li->next) { | |
| 1837 /* Increment the current position counter */ | |
| 1838 curpos++; | |
| 1839 | |
| 1840 /* If we previously saved a "lastpos" information, increment it */ | |
| 1841 if (*lastpos != 0) | |
| 1842 (*lastpos)++; | |
| 1843 | |
| 1844 /* Check the type of the next AVP. We can compare the references directly, it is safe. */ | |
| 1845 if (_A(li->o)->avp_model == model_avp) { | |
| 1846 | |
| 1847 /* This AVP is of the type we are searching */ | |
| 1848 (*count)++; | |
| 1849 | |
| 1850 /* If we don't have yet a "firstpos", save it */ | |
| 1851 if (*firstpos == 0) | |
| 1852 *firstpos = curpos; | |
| 1853 | |
| 1854 /* Reset the lastpos */ | |
| 1855 (*lastpos) = 1; | |
| 1856 } | |
| 1857 } | |
| 1858 } | |
| 1859 | |
| 1860 /* We use this structure as parameter for the next function */ | |
| 1861 struct parserules_data { | |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1862 struct fd_list * sentinel; /* Sentinel of the list of children AVP */ |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1863 struct fd_pei * pei; /* If the rule conflicts, save the error here */ |
| 0 | 1864 }; |
| 1865 | |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1866 /* Create an empty AVP of a given model (to use in Failed-AVP) */ |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1867 static struct avp * empty_avp(struct dict_object * model_avp) |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1868 { |
|
35
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
1869 struct avp * avp = NULL; |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
1870 struct dict_avp_data avp_info; |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
1871 union avp_value val; |
|
400
bb8a4fa301b3
Fix compilation warning
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
387
diff
changeset
|
1872 unsigned char os[1] = { '\0' }; |
|
35
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
1873 |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
1874 /* Create an instance */ |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
1875 CHECK_FCT_DO( fd_msg_avp_new(model_avp, 0, &avp ), return NULL ); |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
1876 |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
1877 /* Type of the AVP */ |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
1878 CHECK_FCT_DO( fd_dict_getval(model_avp, &avp_info), return NULL ); |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
1879 |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
1880 /* Prepare the empty value */ |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
1881 memset(&val, 0, sizeof(val)); |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
1882 switch (avp_info.avp_basetype) { |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
1883 case AVP_TYPE_OCTETSTRING: |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
1884 val.os.data = os; |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
1885 val.os.len = sizeof(os); |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
1886 case AVP_TYPE_INTEGER32: |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
1887 case AVP_TYPE_INTEGER64: |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
1888 case AVP_TYPE_UNSIGNED32: |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
1889 case AVP_TYPE_UNSIGNED64: |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
1890 case AVP_TYPE_FLOAT32: |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
1891 case AVP_TYPE_FLOAT64: |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
1892 CHECK_FCT_DO( fd_msg_avp_setvalue(avp, &val), return NULL ); |
|
400
bb8a4fa301b3
Fix compilation warning
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
387
diff
changeset
|
1893 case AVP_TYPE_GROUPED: |
|
bb8a4fa301b3
Fix compilation warning
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
387
diff
changeset
|
1894 /* For AVP_TYPE_GROUPED we don't do anything */ |
|
bb8a4fa301b3
Fix compilation warning
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
387
diff
changeset
|
1895 break; |
|
bb8a4fa301b3
Fix compilation warning
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
387
diff
changeset
|
1896 default: |
|
bb8a4fa301b3
Fix compilation warning
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
387
diff
changeset
|
1897 ASSERT(0); /* not handled */ |
|
35
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
1898 } |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
1899 |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
1900 return avp; |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1901 } |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1902 |
| 0 | 1903 /* Check that a list of AVPs is compliant with a given rule -- will be iterated on the list of rules */ |
| 1904 static int parserules_check_one_rule(void * data, struct dict_rule_data *rule) | |
| 1905 { | |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1906 int count, first, last, min; |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1907 struct parserules_data * pr_data = data; |
|
280
3019f6220122
Provide more useful debug information for non-ABNF-compliant messages
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
258
diff
changeset
|
1908 char * avp_name = "<unresolved name>"; |
| 0 | 1909 |
| 1910 TRACE_ENTRY("%p %p", data, rule); | |
| 1911 | |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1912 /* Get statistics of the AVP concerned by this rule in the parent instance */ |
| 0 | 1913 parserules_stat_avps( rule->rule_avp, pr_data->sentinel, &count, &first, &last); |
| 1914 | |
|
280
3019f6220122
Provide more useful debug information for non-ABNF-compliant messages
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
258
diff
changeset
|
1915 if (TRACE_BOOL(INFO)) |
| 0 | 1916 { |
| 1917 struct dict_avp_data avpdata; | |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1918 int ret; |
| 0 | 1919 ret = fd_dict_getval(rule->rule_avp, &avpdata); |
|
280
3019f6220122
Provide more useful debug information for non-ABNF-compliant messages
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
258
diff
changeset
|
1920 if (ret == 0) |
|
3019f6220122
Provide more useful debug information for non-ABNF-compliant messages
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
258
diff
changeset
|
1921 avp_name = avpdata.avp_name; |
| 0 | 1922 |
| 1923 TRACE_DEBUG(ANNOYING, "Checking rule: p:%d(%d) m/M:%2d/%2d. Counted %d (first: %d, last:%d) of AVP '%s'", | |
| 1924 rule->rule_position, | |
| 1925 rule->rule_order, | |
| 1926 rule->rule_min, | |
| 1927 rule->rule_max, | |
| 1928 count, | |
| 1929 first, | |
| 1930 last, | |
|
280
3019f6220122
Provide more useful debug information for non-ABNF-compliant messages
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
258
diff
changeset
|
1931 avp_name |
| 0 | 1932 ); |
| 1933 } | |
| 1934 | |
| 1935 /* Now check the rule is not conflicting */ | |
| 1936 | |
| 1937 /* Check the "min" value */ | |
| 1938 if ((min = rule->rule_min) == -1) { | |
| 1939 if (rule->rule_position == RULE_OPTIONAL) | |
| 1940 min = 0; | |
| 1941 else | |
| 1942 min = 1; | |
| 1943 } | |
| 1944 if (count < min) { | |
|
280
3019f6220122
Provide more useful debug information for non-ABNF-compliant messages
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
258
diff
changeset
|
1945 TRACE_DEBUG(INFO, "Conflicting rule: the number of occurences (%d) is < the rule min (%d) for '%s'.", count, min, avp_name); |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1946 if (pr_data->pei) { |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1947 pr_data->pei->pei_errcode = "DIAMETER_MISSING_AVP"; |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1948 pr_data->pei->pei_avp = empty_avp(rule->rule_avp); |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1949 } |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1950 return EBADMSG; |
| 0 | 1951 } |
| 1952 | |
| 1953 /* Check the "max" value */ | |
| 1954 if ((rule->rule_max != -1) && (count > rule->rule_max)) { | |
|
280
3019f6220122
Provide more useful debug information for non-ABNF-compliant messages
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
258
diff
changeset
|
1955 TRACE_DEBUG(INFO, "Conflicting rule: the number of occurences (%d) is > the rule max (%d) for '%s'.", count, rule->rule_max, avp_name); |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1956 if (pr_data->pei) { |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1957 if (rule->rule_max == 0) |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1958 pr_data->pei->pei_errcode = "DIAMETER_AVP_NOT_ALLOWED"; |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1959 else |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1960 pr_data->pei->pei_errcode = "DIAMETER_AVP_OCCURS_TOO_MANY_TIMES"; |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1961 pr_data->pei->pei_avp = empty_avp(rule->rule_avp); /* Well we are supposed to return the (max + 1)th instance of the AVP instead... Pfff... */ TODO("Improve..."); |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1962 } |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1963 return EBADMSG; |
| 0 | 1964 } |
| 1965 | |
| 1966 /* Check the position and order (if relevant) */ | |
| 1967 switch (rule->rule_position) { | |
| 1968 case RULE_OPTIONAL: | |
| 1969 case RULE_REQUIRED: | |
| 1970 /* No special position constraints */ | |
| 1971 break; | |
| 1972 | |
| 1973 case RULE_FIXED_HEAD: | |
| 1974 /* Since "0*1<fixed>" is a valid rule specifier, we only reject cases where the AVP appears *after* its fixed position */ | |
| 1975 if (first > rule->rule_order) { | |
|
280
3019f6220122
Provide more useful debug information for non-ABNF-compliant messages
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
258
diff
changeset
|
1976 TRACE_DEBUG(INFO, "Conflicting rule: the FIXED_HEAD AVP appears first in (%d) position, the rule requires (%d) for '%s'.", first, rule->rule_order, avp_name); |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1977 if (pr_data->pei) { |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1978 pr_data->pei->pei_errcode = "DIAMETER_MISSING_AVP"; |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1979 pr_data->pei->pei_message = "AVP was not in its fixed position"; |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1980 pr_data->pei->pei_avp = empty_avp(rule->rule_avp); |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1981 } |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1982 return EBADMSG; |
| 0 | 1983 } |
| 1984 break; | |
| 1985 | |
| 1986 case RULE_FIXED_TAIL: | |
| 1987 /* Since "0*1<fixed>" is a valid rule specifier, we only reject cases where the AVP appears *before* its fixed position */ | |
| 1988 if (last > rule->rule_order) { /* We have a ">" here because we count in reverse order (i.e. from the end) */ | |
|
280
3019f6220122
Provide more useful debug information for non-ABNF-compliant messages
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
258
diff
changeset
|
1989 TRACE_DEBUG(INFO, "Conflicting rule: the FIXED_TAIL AVP appears last in (%d) position, the rule requires (%d) for '%s'.", last, rule->rule_order, avp_name); |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1990 if (pr_data->pei) { |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1991 pr_data->pei->pei_errcode = "DIAMETER_MISSING_AVP"; |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1992 pr_data->pei->pei_message = "AVP was not in its fixed position"; |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1993 pr_data->pei->pei_avp = empty_avp(rule->rule_avp); |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1994 } |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
1995 return EBADMSG; |
| 0 | 1996 } |
| 1997 break; | |
| 1998 | |
| 1999 default: | |
| 2000 /* What is this position ??? */ | |
| 2001 ASSERT(0); | |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2002 return ENOTSUP; |
| 0 | 2003 } |
| 2004 | |
| 2005 /* We've checked all the parameters */ | |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2006 return 0; |
| 0 | 2007 } |
| 2008 | |
| 2009 /* Check the rules recursively */ | |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2010 static int parserules_do ( struct dictionary * dict, msg_or_avp * object, struct fd_pei *error_info, int mandatory) |
| 0 | 2011 { |
| 2012 struct parserules_data data; | |
| 2013 struct dict_object * model = NULL; | |
| 2014 | |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2015 TRACE_ENTRY("%p %p %p %d", dict, object, error_info, mandatory); |
| 0 | 2016 |
| 2017 /* object has already been checked and dict-parsed when we are called. */ | |
| 2018 | |
| 2019 /* First, handle the cases where there is no model */ | |
| 2020 { | |
| 2021 if (CHECK_MSG(object)) { | |
| 2022 if ( _M(object)->msg_public.msg_flags & CMD_FLAG_ERROR ) { | |
| 2023 /* The case of error messages: the ABNF is different */ | |
| 2024 CHECK_FCT( fd_dict_get_error_cmd(dict, &model) ); | |
| 2025 } else { | |
| 2026 model = _M(object)->msg_model; | |
| 2027 } | |
| 2028 /* Commands MUST be supported in the dictionary */ | |
| 2029 if (model == NULL) { | |
| 2030 TRACE_DEBUG(INFO, "Message with no dictionary model. EBADMSG"); | |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2031 if (error_info) { |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2032 error_info->pei_errcode = "DIAMETER_COMMAND_UNSUPPORTED"; |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2033 error_info->pei_protoerr = 1; |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2034 } |
| 0 | 2035 return EBADMSG; |
| 2036 } | |
| 2037 } | |
| 2038 | |
| 2039 /* AVP with the 'M' flag must also be recognized in the dictionary -- except inside an optional grouped AVP */ | |
| 2040 if (CHECK_AVP(object) && ((model = _A(object)->avp_model) == NULL)) { | |
| 2041 if ( mandatory && (_A(object)->avp_public.avp_flags & AVP_FLAG_MANDATORY)) { | |
| 2042 /* Return an error in this case */ | |
| 2043 TRACE_DEBUG(INFO, "Mandatory AVP with no dictionary model. EBADMSG"); | |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2044 if (error_info) { |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2045 error_info->pei_errcode = "DIAMETER_AVP_UNSUPPORTED"; |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2046 error_info->pei_avp = object; |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2047 } |
| 0 | 2048 return EBADMSG; |
| 2049 } else { | |
| 2050 /* We don't know any rule for this object, so assume OK */ | |
| 2051 TRACE_DEBUG(FULL, "Unknown informational AVP, ignoring..."); | |
| 2052 return 0; | |
| 2053 } | |
| 2054 } | |
| 2055 } | |
| 2056 | |
| 2057 /* At this point we know "model" is set and points to the object's model */ | |
| 2058 | |
| 2059 /* If we are an AVP with no children, just return OK */ | |
| 2060 if (CHECK_AVP(object)) { | |
| 2061 struct dict_avp_data dictdata; | |
| 2062 CHECK_FCT( fd_dict_getval(model, &dictdata) ); | |
| 2063 if (dictdata.avp_basetype != AVP_TYPE_GROUPED) { | |
| 2064 /* This object has no children and no rules */ | |
| 2065 return 0; | |
| 2066 } | |
| 2067 } | |
| 2068 | |
| 2069 /* If this object has children, first check the rules for all its children */ | |
| 2070 { | |
| 2071 int is_child_mand = 0; | |
| 2072 struct fd_list * ch = NULL; | |
| 2073 if ( CHECK_MSG(object) | |
| 2074 || (mandatory && (_A(object)->avp_public.avp_flags & AVP_FLAG_MANDATORY)) ) | |
| 2075 is_child_mand = 1; | |
| 2076 for (ch = _C(object)->children.next; ch != &_C(object)->children; ch = ch->next) { | |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2077 CHECK_FCT( parserules_do ( dict, _C(ch->o), error_info, is_child_mand ) ); |
| 0 | 2078 } |
| 2079 } | |
| 2080 | |
| 2081 /* Now check all rules of this object */ | |
| 2082 data.sentinel = &_C(object)->children; | |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2083 data.pei = error_info; |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2084 CHECK_FCT( fd_dict_iterate_rules ( model, &data, parserules_check_one_rule ) ); |
| 0 | 2085 |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2086 return 0; |
| 0 | 2087 } |
| 2088 | |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2089 int fd_msg_parse_rules ( msg_or_avp * object, struct dictionary * dict, struct fd_pei *error_info) |
| 0 | 2090 { |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2091 TRACE_ENTRY("%p %p %p", object, dict, error_info); |
| 0 | 2092 |
|
35
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
2093 if (error_info) |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
2094 memset(error_info, 0, sizeof(struct fd_pei)); |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
2095 |
| 0 | 2096 /* Resolve the dictionary objects when missing. This also validates the object. */ |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2097 CHECK_FCT( fd_msg_parse_dict ( object, dict, error_info ) ); |
| 0 | 2098 |
| 2099 /* Call the recursive function */ | |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2100 return parserules_do ( dict, object, error_info, 1 ) ; |
| 0 | 2101 } |
| 2102 | |
| 2103 /***************************************************************************************************************/ | |
| 2104 | |
| 2105 /* Compute the lengh of an object and its subtree. */ | |
| 2106 int fd_msg_update_length ( msg_or_avp * object ) | |
| 2107 { | |
| 2108 size_t sz = 0; | |
| 2109 struct dict_object * model; | |
| 2110 union { | |
| 2111 struct dict_cmd_data cmddata; | |
| 2112 struct dict_avp_data avpdata; | |
| 2113 } dictdata; | |
| 2114 | |
| 2115 TRACE_ENTRY("%p", object); | |
| 2116 | |
| 2117 /* Get the model of the object. This also validates the object */ | |
| 2118 CHECK_FCT( fd_msg_model ( object, &model ) ); | |
| 2119 | |
| 2120 /* Get the information of the model */ | |
| 2121 if (model) { | |
| 2122 CHECK_FCT( fd_dict_getval(model, &dictdata) ); | |
| 2123 } else { | |
| 2124 /* For unknown AVP, just don't change the size */ | |
| 2125 if (_C(object)->type == MSG_AVP) | |
| 2126 return 0; | |
| 2127 } | |
| 2128 | |
| 2129 /* Deal with easy cases: AVPs without children */ | |
| 2130 if ((_C(object)->type == MSG_AVP) && (dictdata.avpdata.avp_basetype != AVP_TYPE_GROUPED)) { | |
| 2131 /* Sanity check */ | |
| 2132 ASSERT(FD_IS_LIST_EMPTY(&_A(object)->avp_chain.children)); | |
| 2133 | |
| 2134 /* Now check that the data is set in the AVP */ | |
| 2135 CHECK_PARAMS( _A(object)->avp_public.avp_value ); | |
| 2136 | |
| 2137 sz = GETAVPHDRSZ( _A(object)->avp_public.avp_flags ); | |
| 2138 | |
| 2139 switch (dictdata.avpdata.avp_basetype) { | |
| 2140 case AVP_TYPE_OCTETSTRING: | |
| 2141 sz += _A(object)->avp_public.avp_value->os.len; | |
| 2142 break; | |
| 2143 | |
| 2144 case AVP_TYPE_INTEGER32: | |
| 2145 case AVP_TYPE_INTEGER64: | |
| 2146 case AVP_TYPE_UNSIGNED32: | |
| 2147 case AVP_TYPE_UNSIGNED64: | |
| 2148 case AVP_TYPE_FLOAT32: | |
| 2149 case AVP_TYPE_FLOAT64: | |
| 2150 sz += avp_value_sizes[dictdata.avpdata.avp_basetype]; | |
| 2151 break; | |
| 2152 | |
| 2153 default: | |
| 2154 /* Something went wrong... */ | |
| 2155 ASSERT(0); | |
| 2156 } | |
| 2157 } | |
| 2158 else /* message or grouped AVP */ | |
| 2159 { | |
| 2160 struct fd_list * ch = NULL; | |
| 2161 | |
| 2162 /* First, compute the header size */ | |
| 2163 if (_C(object)->type == MSG_AVP) { | |
| 2164 sz = GETAVPHDRSZ( _A(object)->avp_public.avp_flags ); | |
| 2165 } else { | |
| 2166 sz = GETMSGHDRSZ( ); | |
| 2167 } | |
| 2168 | |
| 2169 /* Recurse in all children and update the sz information */ | |
| 2170 for (ch = _C(object)->children.next; ch != &_C(object)->children; ch = ch->next) { | |
| 2171 CHECK_FCT( fd_msg_update_length ( ch->o ) ); | |
| 2172 | |
| 2173 /* Add the padded size to the parent */ | |
| 2174 sz += PAD4( _A(ch->o)->avp_public.avp_len ); | |
| 2175 } | |
| 2176 } | |
| 2177 | |
| 2178 /* When we arrive here, the "sz" variable contains the size to write in the object */ | |
| 2179 if (_C(object)->type == MSG_AVP) | |
| 2180 _A(object)->avp_public.avp_len = sz; | |
| 2181 else | |
| 2182 _M(object)->msg_public.msg_length = sz; | |
| 2183 | |
| 2184 return 0; | |
| 2185 } | |
| 2186 | |
| 2187 /***************************************************************************************************************/ | |
|
7
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2188 /* Macro to check if further callbacks must be called */ |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2189 #define TEST_ACTION_STOP() \ |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2190 if ((*msg == NULL) || (*action != DISP_ACT_CONT)) \ |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2191 goto no_error; |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2192 |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2193 /* Call all dispatch callbacks for a given message */ |
|
90
2c9444152e4b
Added the dispatch thread code
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
85
diff
changeset
|
2194 int fd_msg_dispatch ( struct msg ** msg, struct session * session, enum disp_action *action, const char ** error_code) |
|
7
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2195 { |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2196 struct dictionary * dict; |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2197 struct dict_object * app; |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2198 struct dict_object * cmd; |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2199 struct avp * avp; |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2200 struct fd_list * cb_list; |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2201 int ret = 0; |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2202 |
|
90
2c9444152e4b
Added the dispatch thread code
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
85
diff
changeset
|
2203 TRACE_ENTRY("%p %p %p %p", msg, session, action, error_code); |
|
7
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2204 CHECK_PARAMS( msg && CHECK_MSG(*msg) && action); |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2205 |
|
90
2c9444152e4b
Added the dispatch thread code
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
85
diff
changeset
|
2206 if (error_code) |
|
2c9444152e4b
Added the dispatch thread code
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
85
diff
changeset
|
2207 *error_code = NULL; |
| 132 | 2208 *action = DISP_ACT_CONT; |
|
90
2c9444152e4b
Added the dispatch thread code
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
85
diff
changeset
|
2209 |
|
7
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2210 /* Take the dispatch lock */ |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2211 CHECK_FCT( pthread_rwlock_rdlock(&fd_disp_lock) ); |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2212 pthread_cleanup_push( fd_cleanup_rwlock, &fd_disp_lock ); |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2213 |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2214 /* First, call the DISP_HOW_ANY callbacks */ |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2215 CHECK_FCT_DO( ret = fd_disp_call_cb_int( NULL, msg, NULL, session, action, NULL, NULL, NULL, NULL ), goto error ); |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2216 |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2217 TEST_ACTION_STOP(); |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2218 |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2219 /* If we don't know the model at this point, we stop cause we cannot get the dictionary. It's invalid: an error should already have been trigged by ANY callbacks */ |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2220 CHECK_PARAMS_DO(cmd = (*msg)->msg_model, { ret = EINVAL; goto error; } ); |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2221 |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2222 /* Now resolve message application */ |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2223 CHECK_FCT_DO( ret = fd_dict_getdict( cmd, &dict ), goto error ); |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2224 CHECK_FCT_DO( ret = fd_dict_search( dict, DICT_APPLICATION, APPLICATION_BY_ID, &(*msg)->msg_public.msg_appl, &app, 0 ), goto error ); |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2225 |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2226 if (app == NULL) { |
|
90
2c9444152e4b
Added the dispatch thread code
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
85
diff
changeset
|
2227 if ((*msg)->msg_public.msg_flags & CMD_FLAG_REQUEST) { |
|
2c9444152e4b
Added the dispatch thread code
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
85
diff
changeset
|
2228 if (error_code) |
|
2c9444152e4b
Added the dispatch thread code
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
85
diff
changeset
|
2229 *error_code = "DIAMETER_APPLICATION_UNSUPPORTED"; |
|
2c9444152e4b
Added the dispatch thread code
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
85
diff
changeset
|
2230 *action = DISP_ACT_ERROR; |
|
2c9444152e4b
Added the dispatch thread code
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
85
diff
changeset
|
2231 } else { |
|
2c9444152e4b
Added the dispatch thread code
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
85
diff
changeset
|
2232 TRACE_DEBUG(INFO, "Received an answer to a local query with an unsupported application %d, discarding...", (*msg)->msg_public.msg_appl); |
|
2c9444152e4b
Added the dispatch thread code
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
85
diff
changeset
|
2233 fd_msg_dump_walk(INFO, *msg); |
|
2c9444152e4b
Added the dispatch thread code
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
85
diff
changeset
|
2234 fd_msg_free(*msg); |
|
2c9444152e4b
Added the dispatch thread code
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
85
diff
changeset
|
2235 *msg = NULL; |
|
2c9444152e4b
Added the dispatch thread code
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
85
diff
changeset
|
2236 } |
|
2c9444152e4b
Added the dispatch thread code
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
85
diff
changeset
|
2237 goto no_error; |
|
7
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2238 } |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2239 |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2240 /* So start browsing the message */ |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2241 CHECK_FCT_DO( ret = fd_msg_browse( *msg, MSG_BRW_FIRST_CHILD, &avp, NULL ), goto error ); |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2242 while (avp != NULL) { |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2243 /* For unknown AVP, we don't have a callback registered, so just skip */ |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2244 if (avp->avp_model) { |
|
330
e283e18b2673
Removed incorrect ASSERT -- thanks to Alexandre for the bug finding.
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
291
diff
changeset
|
2245 struct dict_object * enumval = NULL; |
|
7
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2246 |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2247 /* Get the list of callback for this AVP */ |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2248 CHECK_FCT_DO( ret = fd_dict_disp_cb(DICT_AVP, avp->avp_model, &cb_list), goto error ); |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2249 |
|
330
e283e18b2673
Removed incorrect ASSERT -- thanks to Alexandre for the bug finding.
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
291
diff
changeset
|
2250 /* We search enumerated values only in case of non-grouped AVP */ |
|
e283e18b2673
Removed incorrect ASSERT -- thanks to Alexandre for the bug finding.
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
291
diff
changeset
|
2251 if ( avp->avp_public.avp_value ) { |
|
e283e18b2673
Removed incorrect ASSERT -- thanks to Alexandre for the bug finding.
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
291
diff
changeset
|
2252 struct dict_object * type; |
|
e283e18b2673
Removed incorrect ASSERT -- thanks to Alexandre for the bug finding.
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
291
diff
changeset
|
2253 /* Check if the AVP has a constant value */ |
|
e283e18b2673
Removed incorrect ASSERT -- thanks to Alexandre for the bug finding.
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
291
diff
changeset
|
2254 CHECK_FCT_DO( ret = fd_dict_search(dict, DICT_TYPE, TYPE_OF_AVP, avp->avp_model, &type, 0), goto error ); |
|
e283e18b2673
Removed incorrect ASSERT -- thanks to Alexandre for the bug finding.
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
291
diff
changeset
|
2255 if (type) { |
|
e283e18b2673
Removed incorrect ASSERT -- thanks to Alexandre for the bug finding.
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
291
diff
changeset
|
2256 struct dict_enumval_request req; |
|
e283e18b2673
Removed incorrect ASSERT -- thanks to Alexandre for the bug finding.
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
291
diff
changeset
|
2257 memset(&req, 0, sizeof(struct dict_enumval_request)); |
|
e283e18b2673
Removed incorrect ASSERT -- thanks to Alexandre for the bug finding.
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
291
diff
changeset
|
2258 req.type_obj = type; |
|
e283e18b2673
Removed incorrect ASSERT -- thanks to Alexandre for the bug finding.
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
291
diff
changeset
|
2259 memcpy( &req.search.enum_value, avp->avp_public.avp_value, sizeof(union avp_value) ); |
|
e283e18b2673
Removed incorrect ASSERT -- thanks to Alexandre for the bug finding.
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
291
diff
changeset
|
2260 CHECK_FCT_DO( ret = fd_dict_search(dict, DICT_ENUMVAL, ENUMVAL_BY_STRUCT, &req, &enumval, 0), goto error ); |
|
e283e18b2673
Removed incorrect ASSERT -- thanks to Alexandre for the bug finding.
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
291
diff
changeset
|
2261 } |
|
7
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2262 } |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2263 |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2264 /* Call the callbacks */ |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2265 CHECK_FCT_DO( ret = fd_disp_call_cb_int( cb_list, msg, avp, session, action, app, cmd, avp->avp_model, enumval ), goto error ); |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2266 TEST_ACTION_STOP(); |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2267 } |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2268 /* Go to next AVP */ |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2269 CHECK_FCT_DO( ret = fd_msg_browse( avp, MSG_BRW_WALK, &avp, NULL ), goto error ); |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2270 } |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2271 |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2272 /* Now call command and application callbacks */ |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2273 CHECK_FCT_DO( ret = fd_dict_disp_cb(DICT_COMMAND, cmd, &cb_list), goto error ); |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2274 CHECK_FCT_DO( ret = fd_disp_call_cb_int( cb_list, msg, NULL, session, action, app, cmd, NULL, NULL ), goto error ); |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2275 TEST_ACTION_STOP(); |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2276 |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2277 if (app) { |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2278 CHECK_FCT_DO( ret = fd_dict_disp_cb(DICT_APPLICATION, app, &cb_list), goto error ); |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2279 CHECK_FCT_DO( ret = fd_disp_call_cb_int( cb_list, msg, NULL, session, action, app, cmd, NULL, NULL ), goto error ); |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2280 TEST_ACTION_STOP(); |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2281 } |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2282 |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2283 pthread_cleanup_pop(0); |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2284 |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2285 no_error: |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2286 CHECK_POSIX(pthread_rwlock_unlock(&fd_disp_lock) ); |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2287 return 0; |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2288 |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2289 error: |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2290 CHECK_POSIX_DO(pthread_rwlock_unlock(&fd_disp_lock), /* ignore */ ); |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2291 return ret; |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2292 } |