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