Mercurial > hg > freeDiameter
annotate libfdproto/messages.c @ 1121:ccbd1426e04a
Improve testmesg_stress to measure impact of loaded dictionary
| author | Sebastien Decugis <sdecugis@freediameter.net> |
|---|---|
| date | Tue, 14 May 2013 15:27:28 +0800 |
| parents | c473581adff2 |
| children | 98d1ad9bf85a |
| 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 * * |
|
928
5053f1abcf5d
Updated copyright information
Sebastien Decugis <sdecugis@freediameter.net>
parents:
924
diff
changeset
|
5 * Copyright (c) 2013, 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. | |
| 871 | 65 * Example: |
| 0 | 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 */ | |
|
1092
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
91 struct { |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
92 avp_code_t mnf_code; |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
93 vendor_id_t mnf_vendor; |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
94 } avp_model_not_found; /* When model resolution has failed, store a copy of the data here to avoid searching again */ |
| 0 | 95 struct avp_hdr avp_public; /* AVP data that can be managed by other modules */ |
| 96 | |
| 97 uint8_t *avp_source; /* If the message was parsed from a buffer, pointer to the AVP data start in the buffer. */ | |
| 98 uint8_t *avp_rawdata; /* when the data can not be interpreted, the raw data is copied here. The header is not part of it. */ | |
| 99 size_t avp_rawlen; /* The length of the raw buffer. */ | |
| 100 union avp_value avp_storage; /* To avoid many alloc/free, store the integer values here and set avp_public.avp_data to &storage */ | |
| 101 int avp_mustfreeos; /* 1 if an octetstring is malloc'd in avp_storage and must be freed. */ | |
| 102 }; | |
| 103 | |
| 104 /* Macro to compute the AVP header size */ | |
| 105 #define AVPHDRSZ_NOVEND 8 | |
| 106 #define AVPHDRSZ_VENDOR 12 | |
| 107 #define GETAVPHDRSZ( _flag ) ((_flag & AVP_FLAG_VENDOR) ? AVPHDRSZ_VENDOR : AVPHDRSZ_NOVEND) | |
| 108 | |
| 109 /* Macro to cast a msg_avp_t */ | |
| 110 #define _A(_x) ((struct avp *)(_x)) | |
| 111 /* Check the type and eyecatcher */ | |
|
915
9bd18fa4e601
Fix macro to avoid infinite loop in some situations
Sebastien Decugis <sdecugis@freediameter.net>
parents:
903
diff
changeset
|
112 #define CHECK_AVP(_x) ((_x) && (_C(_x)->type == MSG_AVP) && (_A(_x)->avp_eyec == MSG_AVP_EYEC)) |
| 0 | 113 |
| 114 /* The following structure represents an instance of a message (command and children AVPs). */ | |
| 115 struct msg { | |
| 116 struct msg_avp_chain msg_chain; /* List of the AVPs in the message */ | |
| 117 int msg_eyec; /* Must be equal to MSG_MSG_EYEC */ | |
| 118 struct dict_object *msg_model; /* If not NULL, pointer to the dictionary object of this message */ | |
|
1092
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
119 struct { |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
120 command_code_t mnf_code; |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
121 uint8_t mnf_flags; |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
122 } msg_model_not_found; /* When model resolution has failed, store a copy of the data here to avoid searching again */ |
| 0 | 123 struct msg_hdr msg_public; /* Message data that can be managed by extensions. */ |
| 124 | |
| 125 uint8_t *msg_rawbuffer; /* data buffer that was received, saved during fd_msg_parse_buffer and freed in fd_msg_parse_dict */ | |
| 126 int msg_routable; /* Is this a routable message? (0: undef, 1: routable, 2: non routable) */ | |
| 127 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
|
128 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
|
129 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
|
130 struct session *msg_sess; /* Cached message session if any */ |
| 0 | 131 struct { |
|
1014
908ffbb81f60
Added a second callback in fd_msg_send_timeout to handle more easily the timeout situation
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1009
diff
changeset
|
132 void (*anscb)(void *, struct msg **); |
|
908ffbb81f60
Added a second callback in fd_msg_send_timeout to handle more easily the timeout situation
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1009
diff
changeset
|
133 void (*expirecb)(void *, DiamId_t, size_t, struct msg **); |
| 0 | 134 void * data; |
|
646
cfc8da9264f4
Prepared first part of the changes for #10
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
638
diff
changeset
|
135 struct timespec timeout; |
|
1014
908ffbb81f60
Added a second callback in fd_msg_send_timeout to handle more easily the timeout situation
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1009
diff
changeset
|
136 } msg_cb; /* Callback to be called when an answer is received, or timeout expires, if not NULL */ |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
704
diff
changeset
|
137 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
|
138 size_t msg_src_id_len; /* cached length of this string */ |
|
1098
f38d77f9cfd3
Initial implementation of the hook mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1096
diff
changeset
|
139 struct fd_msg_pmdl msg_pmdl; /* list of permessagedata structures. */ |
| 0 | 140 }; |
| 141 | |
| 142 /* Macro to compute the message header size */ | |
| 143 #define GETMSGHDRSZ() 20 | |
| 144 | |
| 145 /* Macro to cast a msg_avp_t */ | |
| 146 #define _M(_x) ((struct msg *)(_x)) | |
| 147 /* Check the type and eyecatcher */ | |
|
704
289632905e19
Added new sanity check
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
690
diff
changeset
|
148 #define CHECK_MSG(_x) ((_x) && (_C(_x)->type == MSG_MSG) && (_M(_x)->msg_eyec == MSG_MSG_EYEC)) |
| 0 | 149 |
| 150 #define VALIDATE_OBJ(_x) ( (CHECK_MSG(_x)) || (CHECK_AVP(_x)) ) | |
| 151 | |
| 152 | |
| 153 /* Macro to validate a MSGFL_ value */ | |
|
638
9448cba86673
Improved usability of dbg_interactive
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
637
diff
changeset
|
154 #define CHECK_AVPFL(_fl) ( ((_fl) & (- (AVPFL_MAX << 1) )) == 0 ) |
| 0 | 155 #define CHECK_MSGFL(_fl) ( ((_fl) & (- (MSGFL_MAX << 1) )) == 0 ) |
| 156 | |
| 157 | |
| 158 /* initial sizes of AVP from their types, in bytes. */ | |
| 159 static int avp_value_sizes[] = { | |
| 160 0, /* AVP_TYPE_GROUPED: size is dynamic */ | |
| 161 0, /* AVP_TYPE_OCTETSTRING: size is dynamic */ | |
| 162 4, /* AVP_TYPE_INTEGER32: size is 32 bits */ | |
| 163 8, /* AVP_TYPE_INTEGER64: size is 64 bits */ | |
| 164 4, /* AVP_TYPE_UNSIGNED32: size is 32 bits */ | |
| 165 8, /* AVP_TYPE_UNSIGNED64: size is 64 bits */ | |
| 166 4, /* AVP_TYPE_FLOAT32: size is 32 bits */ | |
| 167 8 /* AVP_TYPE_FLOAT64: size is 64 bits */ | |
| 168 }; | |
| 169 #define CHECK_BASETYPE( _type ) ( ((_type) <= AVP_TYPE_MAX) && ((_type) >= 0) ) | |
| 170 #define GETINITIALSIZE( _type, _vend ) (avp_value_sizes[ CHECK_BASETYPE(_type) ? (_type) : 0] + GETAVPHDRSZ(_vend)) | |
| 171 | |
| 172 /* Forward declaration */ | |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
173 static int parsedict_do_msg(struct dictionary * dict, struct msg * msg, int only_hdr, struct fd_pei *error_info); |
| 0 | 174 |
| 175 /***************************************************************************************************************/ | |
| 176 /* Creating objects */ | |
| 177 | |
| 178 /* Initialize a msg_avp_chain structure */ | |
| 179 static void init_chain(struct msg_avp_chain * chain, int type) | |
| 180 { | |
| 181 fd_list_init( &chain->chaining, (void *)chain); | |
| 182 fd_list_init( &chain->children, (void *)chain); | |
| 183 chain->type = type; | |
| 184 } | |
| 185 | |
| 186 /* Initialize a new AVP object */ | |
| 187 static void init_avp ( struct avp * avp ) | |
| 188 { | |
| 189 TRACE_ENTRY("%p", avp); | |
| 190 | |
| 191 memset(avp, 0, sizeof(struct avp)); | |
| 192 init_chain( &avp->avp_chain, MSG_AVP); | |
| 193 avp->avp_eyec = MSG_AVP_EYEC; | |
| 194 } | |
| 195 | |
| 196 /* Initialize a new MSG object */ | |
| 197 static void init_msg ( struct msg * msg ) | |
| 198 { | |
| 199 TRACE_ENTRY("%p", msg); | |
| 200 | |
| 201 memset(msg, 0, sizeof(struct msg)); | |
| 202 init_chain( &msg->msg_chain, MSG_MSG); | |
| 203 msg->msg_eyec = MSG_MSG_EYEC; | |
|
1103
d8591b1c56cd
Implemented a few hooks
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1101
diff
changeset
|
204 |
|
d8591b1c56cd
Implemented a few hooks
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1101
diff
changeset
|
205 fd_list_init(&msg->msg_pmdl.sentinel, NULL); |
|
d8591b1c56cd
Implemented a few hooks
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1101
diff
changeset
|
206 CHECK_POSIX_DO( pthread_mutex_init(&msg->msg_pmdl.lock, NULL), ); |
| 0 | 207 } |
| 208 | |
| 209 | |
| 210 /* Create a new AVP instance */ | |
| 211 int fd_msg_avp_new ( struct dict_object * model, int flags, struct avp ** avp ) | |
| 212 { | |
| 213 struct avp *new = NULL; | |
| 214 | |
| 215 TRACE_ENTRY("%p %x %p", model, flags, avp); | |
| 216 | |
| 217 /* Check the parameters */ | |
|
638
9448cba86673
Improved usability of dbg_interactive
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
637
diff
changeset
|
218 CHECK_PARAMS( avp && CHECK_AVPFL(flags) ); |
| 0 | 219 |
| 220 if (model) { | |
| 221 enum dict_object_type dicttype; | |
| 222 CHECK_PARAMS( (fd_dict_gettype(model, &dicttype) == 0) && (dicttype == DICT_AVP) ); | |
| 223 } | |
| 224 | |
| 225 /* Create a new object */ | |
| 226 CHECK_MALLOC( new = malloc (sizeof(struct avp)) ); | |
| 227 | |
| 228 /* Initialize the fields */ | |
| 229 init_avp(new); | |
| 230 | |
| 231 if (model) { | |
| 232 struct dict_avp_data dictdata; | |
| 233 | |
| 234 CHECK_FCT( fd_dict_getval(model, &dictdata) ); | |
| 235 | |
| 236 new->avp_model = model; | |
| 237 new->avp_public.avp_code = dictdata.avp_code; | |
| 238 new->avp_public.avp_flags = dictdata.avp_flag_val; | |
| 239 new->avp_public.avp_len = GETINITIALSIZE(dictdata.avp_basetype, dictdata.avp_flag_val ); | |
| 240 new->avp_public.avp_vendor = dictdata.avp_vendor; | |
| 241 } | |
| 242 | |
|
638
9448cba86673
Improved usability of dbg_interactive
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
637
diff
changeset
|
243 if (flags & AVPFL_SET_BLANK_VALUE) { |
|
9448cba86673
Improved usability of dbg_interactive
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
637
diff
changeset
|
244 new->avp_public.avp_value = &new->avp_storage; |
|
9448cba86673
Improved usability of dbg_interactive
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
637
diff
changeset
|
245 } |
|
9448cba86673
Improved usability of dbg_interactive
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
637
diff
changeset
|
246 |
|
892
b2e8f1a3ef76
Allow the content of the Failed-AVP to be parseable to bufferize the message. The content is only padded currently
Sebastien Decugis <sdecugis@freediameter.net>
parents:
891
diff
changeset
|
247 if (flags & AVPFL_SET_RAWDATA_FROM_AVP) { |
|
b2e8f1a3ef76
Allow the content of the Failed-AVP to be parseable to bufferize the message. The content is only padded currently
Sebastien Decugis <sdecugis@freediameter.net>
parents:
891
diff
changeset
|
248 new->avp_rawlen = (*avp)->avp_public.avp_len - GETAVPHDRSZ( (*avp)->avp_public.avp_flags ); |
|
b2e8f1a3ef76
Allow the content of the Failed-AVP to be parseable to bufferize the message. The content is only padded currently
Sebastien Decugis <sdecugis@freediameter.net>
parents:
891
diff
changeset
|
249 if (new->avp_rawlen) { |
|
b2e8f1a3ef76
Allow the content of the Failed-AVP to be parseable to bufferize the message. The content is only padded currently
Sebastien Decugis <sdecugis@freediameter.net>
parents:
891
diff
changeset
|
250 CHECK_MALLOC( new->avp_rawdata = malloc(new->avp_rawlen) ); |
|
916
058e95c3a336
Initialize dummy AVP for Failed-AVP content with 0s instead of FFs
Sebastien Decugis <sdecugis@freediameter.net>
parents:
915
diff
changeset
|
251 memset(new->avp_rawdata, 0x00, new->avp_rawlen); |
|
892
b2e8f1a3ef76
Allow the content of the Failed-AVP to be parseable to bufferize the message. The content is only padded currently
Sebastien Decugis <sdecugis@freediameter.net>
parents:
891
diff
changeset
|
252 } |
|
b2e8f1a3ef76
Allow the content of the Failed-AVP to be parseable to bufferize the message. The content is only padded currently
Sebastien Decugis <sdecugis@freediameter.net>
parents:
891
diff
changeset
|
253 } |
|
b2e8f1a3ef76
Allow the content of the Failed-AVP to be parseable to bufferize the message. The content is only padded currently
Sebastien Decugis <sdecugis@freediameter.net>
parents:
891
diff
changeset
|
254 |
| 0 | 255 /* The new object is ready, return */ |
| 256 *avp = new; | |
| 257 return 0; | |
| 258 } | |
| 259 | |
| 260 /* Create a new message instance */ | |
| 261 int fd_msg_new ( struct dict_object * model, int flags, struct msg ** msg ) | |
| 262 { | |
| 263 struct msg * new = NULL; | |
| 264 | |
| 265 TRACE_ENTRY("%p %x %p", model, flags, msg); | |
| 266 | |
| 267 /* Check the parameters */ | |
| 268 CHECK_PARAMS( msg && CHECK_MSGFL(flags) ); | |
| 269 | |
| 270 if (model) { | |
| 271 enum dict_object_type dicttype; | |
| 272 CHECK_PARAMS( (fd_dict_gettype(model, &dicttype) == 0) && (dicttype == DICT_COMMAND) ); | |
| 273 } | |
| 274 | |
| 275 /* Create a new object */ | |
| 276 CHECK_MALLOC( new = malloc (sizeof(struct msg)) ); | |
| 277 | |
| 278 /* Initialize the fields */ | |
| 279 init_msg(new); | |
| 280 new->msg_public.msg_version = DIAMETER_VERSION; | |
| 281 new->msg_public.msg_length = GETMSGHDRSZ(); /* This will be updated later */ | |
| 282 | |
| 283 if (model) { | |
| 284 struct dictionary *dict; | |
| 285 struct dict_cmd_data dictdata; | |
| 286 struct dict_object *dictappl; | |
| 287 | |
| 288 CHECK_FCT( fd_dict_getdict(model, &dict) ); | |
| 289 CHECK_FCT( fd_dict_getval(model, &dictdata) ); | |
| 290 | |
| 291 new->msg_model = model; | |
| 292 new->msg_public.msg_flags = dictdata.cmd_flag_val; | |
| 293 new->msg_public.msg_code = dictdata.cmd_code; | |
| 294 | |
| 295 /* Initialize application from the parent, if any */ | |
| 296 CHECK_FCT( fd_dict_search( dict, DICT_APPLICATION, APPLICATION_OF_COMMAND, model, &dictappl, 0) ); | |
| 297 if (dictappl != NULL) { | |
| 298 struct dict_application_data appdata; | |
| 299 CHECK_FCT( fd_dict_getval(dictappl, &appdata) ); | |
| 300 new->msg_public.msg_appl = appdata.application_id; | |
| 301 } | |
| 302 } | |
| 303 | |
| 304 if (flags & MSGFL_ALLOC_ETEID) { | |
| 305 new->msg_public.msg_eteid = fd_msg_eteid_get(); | |
| 306 } | |
| 307 | |
| 308 /* The new object is ready, return */ | |
| 309 *msg = new; | |
| 310 return 0; | |
| 311 } | |
| 312 | |
|
992
80584f0e851a
Copy by default the Proxy-Info AVP included in requests into the answers. Use MSGFL_ANSW_NOPROXYINFO to ignore. This code has not been tested yet.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
979
diff
changeset
|
313 static int bufferize_avp(unsigned char * buffer, size_t buflen, size_t * offset, struct avp * avp); |
|
80584f0e851a
Copy by default the Proxy-Info AVP included in requests into the answers. Use MSGFL_ANSW_NOPROXYINFO to ignore. This code has not been tested yet.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
979
diff
changeset
|
314 static int parsebuf_list(unsigned char * buf, size_t buflen, struct fd_list * head); |
|
1001
d03f7e3805ad
Fix generation of the Proxy-Info AVP in fd_msg_new_answer_from_req
Sebastien Decugis <sdecugis@freediameter.net>
parents:
995
diff
changeset
|
315 static int parsedict_do_chain(struct dictionary * dict, struct fd_list * head, int mandatory, struct fd_pei *error_info); |
|
d03f7e3805ad
Fix generation of the Proxy-Info AVP in fd_msg_new_answer_from_req
Sebastien Decugis <sdecugis@freediameter.net>
parents:
995
diff
changeset
|
316 |
|
992
80584f0e851a
Copy by default the Proxy-Info AVP included in requests into the answers. Use MSGFL_ANSW_NOPROXYINFO to ignore. This code has not been tested yet.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
979
diff
changeset
|
317 |
| 0 | 318 /* Create answer from a request */ |
| 319 int fd_msg_new_answer_from_req ( struct dictionary * dict, struct msg ** msg, int flags ) | |
| 320 { | |
| 321 struct dict_object * model = NULL; | |
| 322 struct msg *qry, *ans; | |
|
112
6a294d977878
Default to add Session-Id in answers
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
100
diff
changeset
|
323 struct session * sess = NULL; |
| 0 | 324 |
| 325 TRACE_ENTRY("%p %x", msg, flags); | |
| 326 | |
| 327 /* Check the parameters */ | |
| 328 CHECK_PARAMS( msg ); | |
| 329 qry = *msg; | |
| 330 CHECK_PARAMS( CHECK_MSG(qry) && (qry->msg_public.msg_flags & CMD_FLAG_REQUEST) ); | |
| 331 | |
|
112
6a294d977878
Default to add Session-Id in answers
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
100
diff
changeset
|
332 if (! (flags & MSGFL_ANSW_NOSID)) { |
|
6a294d977878
Default to add Session-Id in answers
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
100
diff
changeset
|
333 /* Get the session of the message */ |
|
6a294d977878
Default to add Session-Id in answers
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
100
diff
changeset
|
334 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
|
335 } |
|
6a294d977878
Default to add Session-Id in answers
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
100
diff
changeset
|
336 |
| 0 | 337 /* Find the model for the answer */ |
| 338 if (flags & MSGFL_ANSW_ERROR) { | |
| 339 /* The model is the generic error format */ | |
| 340 CHECK_FCT( fd_dict_get_error_cmd(dict, &model) ); | |
| 341 } else { | |
| 342 /* 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
|
343 CHECK_FCT_DO( parsedict_do_msg( dict, qry, 1, NULL), /* continue */ ); |
| 0 | 344 if (qry->msg_model) { |
| 345 CHECK_FCT( fd_dict_search ( dict, DICT_COMMAND, CMD_ANSWER, qry->msg_model, &model, EINVAL ) ); | |
| 346 } | |
| 347 } | |
| 348 | |
| 349 /* Create the answer */ | |
| 350 CHECK_FCT( fd_msg_new( model, flags, &ans ) ); | |
| 351 | |
| 352 /* Set informations in the answer as in the query */ | |
| 353 ans->msg_public.msg_code = qry->msg_public.msg_code; /* useful for MSGFL_ANSW_ERROR */ | |
| 354 ans->msg_public.msg_appl = qry->msg_public.msg_appl; | |
| 355 ans->msg_public.msg_eteid = qry->msg_public.msg_eteid; | |
| 356 ans->msg_public.msg_hbhid = qry->msg_public.msg_hbhid; | |
| 357 | |
|
112
6a294d977878
Default to add Session-Id in answers
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
100
diff
changeset
|
358 /* 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
|
359 if (sess && dict) { |
|
1092
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
360 static struct dict_object * sess_id_avp = NULL; |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
704
diff
changeset
|
361 os0_t sid; |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
704
diff
changeset
|
362 size_t sidlen; |
|
112
6a294d977878
Default to add Session-Id in answers
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
100
diff
changeset
|
363 struct avp * avp; |
|
6a294d977878
Default to add Session-Id in answers
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
100
diff
changeset
|
364 union avp_value val; |
|
6a294d977878
Default to add Session-Id in answers
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
100
diff
changeset
|
365 |
|
1092
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
366 if (!sess_id_avp) { |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
367 CHECK_FCT( fd_dict_search( dict, DICT_AVP, AVP_BY_NAME, "Session-Id", &sess_id_avp, ENOENT) ); |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
368 } |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
704
diff
changeset
|
369 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
|
370 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
|
371 val.os.data = sid; |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
704
diff
changeset
|
372 val.os.len = sidlen; |
|
112
6a294d977878
Default to add Session-Id in answers
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
100
diff
changeset
|
373 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
|
374 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
|
375 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
|
376 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
|
377 } |
|
6a294d977878
Default to add Session-Id in answers
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
100
diff
changeset
|
378 |
|
992
80584f0e851a
Copy by default the Proxy-Info AVP included in requests into the answers. Use MSGFL_ANSW_NOPROXYINFO to ignore. This code has not been tested yet.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
979
diff
changeset
|
379 /* Add all Proxy-Info AVPs from the query if any */ |
|
80584f0e851a
Copy by default the Proxy-Info AVP included in requests into the answers. Use MSGFL_ANSW_NOPROXYINFO to ignore. This code has not been tested yet.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
979
diff
changeset
|
380 if (! (flags & MSGFL_ANSW_NOPROXYINFO)) { |
|
80584f0e851a
Copy by default the Proxy-Info AVP included in requests into the answers. Use MSGFL_ANSW_NOPROXYINFO to ignore. This code has not been tested yet.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
979
diff
changeset
|
381 struct avp * avp; |
|
1001
d03f7e3805ad
Fix generation of the Proxy-Info AVP in fd_msg_new_answer_from_req
Sebastien Decugis <sdecugis@freediameter.net>
parents:
995
diff
changeset
|
382 struct fd_pei pei; |
|
d03f7e3805ad
Fix generation of the Proxy-Info AVP in fd_msg_new_answer_from_req
Sebastien Decugis <sdecugis@freediameter.net>
parents:
995
diff
changeset
|
383 struct fd_list avpcpylist = FD_LIST_INITIALIZER(avpcpylist); |
|
d03f7e3805ad
Fix generation of the Proxy-Info AVP in fd_msg_new_answer_from_req
Sebastien Decugis <sdecugis@freediameter.net>
parents:
995
diff
changeset
|
384 |
|
992
80584f0e851a
Copy by default the Proxy-Info AVP included in requests into the answers. Use MSGFL_ANSW_NOPROXYINFO to ignore. This code has not been tested yet.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
979
diff
changeset
|
385 CHECK_FCT( fd_msg_browse(qry, MSG_BRW_FIRST_CHILD, &avp, NULL) ); |
|
80584f0e851a
Copy by default the Proxy-Info AVP included in requests into the answers. Use MSGFL_ANSW_NOPROXYINFO to ignore. This code has not been tested yet.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
979
diff
changeset
|
386 while (avp) { |
|
80584f0e851a
Copy by default the Proxy-Info AVP included in requests into the answers. Use MSGFL_ANSW_NOPROXYINFO to ignore. This code has not been tested yet.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
979
diff
changeset
|
387 if ( (avp->avp_public.avp_code == AC_PROXY_INFO) |
|
80584f0e851a
Copy by default the Proxy-Info AVP included in requests into the answers. Use MSGFL_ANSW_NOPROXYINFO to ignore. This code has not been tested yet.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
979
diff
changeset
|
388 && (avp->avp_public.avp_vendor == 0) ) { |
|
80584f0e851a
Copy by default the Proxy-Info AVP included in requests into the answers. Use MSGFL_ANSW_NOPROXYINFO to ignore. This code has not been tested yet.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
979
diff
changeset
|
389 /* We found a Proxy-Info, need to duplicate it in the answer */ |
|
80584f0e851a
Copy by default the Proxy-Info AVP included in requests into the answers. Use MSGFL_ANSW_NOPROXYINFO to ignore. This code has not been tested yet.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
979
diff
changeset
|
390 |
|
80584f0e851a
Copy by default the Proxy-Info AVP included in requests into the answers. Use MSGFL_ANSW_NOPROXYINFO to ignore. This code has not been tested yet.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
979
diff
changeset
|
391 /* In order to avoid dealing with all different possibilities of states, we just create a buffer then parse it */ |
|
80584f0e851a
Copy by default the Proxy-Info AVP included in requests into the answers. Use MSGFL_ANSW_NOPROXYINFO to ignore. This code has not been tested yet.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
979
diff
changeset
|
392 unsigned char * buf = NULL; |
|
80584f0e851a
Copy by default the Proxy-Info AVP included in requests into the answers. Use MSGFL_ANSW_NOPROXYINFO to ignore. This code has not been tested yet.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
979
diff
changeset
|
393 size_t offset = 0; |
|
80584f0e851a
Copy by default the Proxy-Info AVP included in requests into the answers. Use MSGFL_ANSW_NOPROXYINFO to ignore. This code has not been tested yet.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
979
diff
changeset
|
394 |
|
1001
d03f7e3805ad
Fix generation of the Proxy-Info AVP in fd_msg_new_answer_from_req
Sebastien Decugis <sdecugis@freediameter.net>
parents:
995
diff
changeset
|
395 /* Create a buffer with the content of the AVP. This is easier than going through the list */ |
|
992
80584f0e851a
Copy by default the Proxy-Info AVP included in requests into the answers. Use MSGFL_ANSW_NOPROXYINFO to ignore. This code has not been tested yet.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
979
diff
changeset
|
396 CHECK_FCT( fd_msg_update_length(avp) ); |
|
80584f0e851a
Copy by default the Proxy-Info AVP included in requests into the answers. Use MSGFL_ANSW_NOPROXYINFO to ignore. This code has not been tested yet.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
979
diff
changeset
|
397 CHECK_MALLOC( buf = malloc(avp->avp_public.avp_len) ); |
|
80584f0e851a
Copy by default the Proxy-Info AVP included in requests into the answers. Use MSGFL_ANSW_NOPROXYINFO to ignore. This code has not been tested yet.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
979
diff
changeset
|
398 CHECK_FCT( bufferize_avp(buf, avp->avp_public.avp_len, &offset, avp) ); |
|
80584f0e851a
Copy by default the Proxy-Info AVP included in requests into the answers. Use MSGFL_ANSW_NOPROXYINFO to ignore. This code has not been tested yet.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
979
diff
changeset
|
399 |
|
1001
d03f7e3805ad
Fix generation of the Proxy-Info AVP in fd_msg_new_answer_from_req
Sebastien Decugis <sdecugis@freediameter.net>
parents:
995
diff
changeset
|
400 /* Now we parse this buffer to create a copy AVP */ |
|
d03f7e3805ad
Fix generation of the Proxy-Info AVP in fd_msg_new_answer_from_req
Sebastien Decugis <sdecugis@freediameter.net>
parents:
995
diff
changeset
|
401 CHECK_FCT( parsebuf_list(buf, avp->avp_public.avp_len, &avpcpylist) ); |
|
d03f7e3805ad
Fix generation of the Proxy-Info AVP in fd_msg_new_answer_from_req
Sebastien Decugis <sdecugis@freediameter.net>
parents:
995
diff
changeset
|
402 |
|
d03f7e3805ad
Fix generation of the Proxy-Info AVP in fd_msg_new_answer_from_req
Sebastien Decugis <sdecugis@freediameter.net>
parents:
995
diff
changeset
|
403 /* Parse dictionary objects now to remove the dependency on the buffer */ |
|
d03f7e3805ad
Fix generation of the Proxy-Info AVP in fd_msg_new_answer_from_req
Sebastien Decugis <sdecugis@freediameter.net>
parents:
995
diff
changeset
|
404 CHECK_FCT( parsedict_do_chain(dict, &avpcpylist, 0, &pei) ); |
|
992
80584f0e851a
Copy by default the Proxy-Info AVP included in requests into the answers. Use MSGFL_ANSW_NOPROXYINFO to ignore. This code has not been tested yet.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
979
diff
changeset
|
405 |
|
80584f0e851a
Copy by default the Proxy-Info AVP included in requests into the answers. Use MSGFL_ANSW_NOPROXYINFO to ignore. This code has not been tested yet.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
979
diff
changeset
|
406 /* Done for this AVP */ |
|
80584f0e851a
Copy by default the Proxy-Info AVP included in requests into the answers. Use MSGFL_ANSW_NOPROXYINFO to ignore. This code has not been tested yet.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
979
diff
changeset
|
407 free(buf); |
|
1001
d03f7e3805ad
Fix generation of the Proxy-Info AVP in fd_msg_new_answer_from_req
Sebastien Decugis <sdecugis@freediameter.net>
parents:
995
diff
changeset
|
408 |
|
d03f7e3805ad
Fix generation of the Proxy-Info AVP in fd_msg_new_answer_from_req
Sebastien Decugis <sdecugis@freediameter.net>
parents:
995
diff
changeset
|
409 /* We move this AVP now so that we do not parse again in next loop */ |
|
d03f7e3805ad
Fix generation of the Proxy-Info AVP in fd_msg_new_answer_from_req
Sebastien Decugis <sdecugis@freediameter.net>
parents:
995
diff
changeset
|
410 fd_list_move_end(&ans->msg_chain.children, &avpcpylist); |
|
992
80584f0e851a
Copy by default the Proxy-Info AVP included in requests into the answers. Use MSGFL_ANSW_NOPROXYINFO to ignore. This code has not been tested yet.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
979
diff
changeset
|
411 } |
|
80584f0e851a
Copy by default the Proxy-Info AVP included in requests into the answers. Use MSGFL_ANSW_NOPROXYINFO to ignore. This code has not been tested yet.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
979
diff
changeset
|
412 /* move to next AVP in the message, we can have several Proxy-Info instances */ |
|
80584f0e851a
Copy by default the Proxy-Info AVP included in requests into the answers. Use MSGFL_ANSW_NOPROXYINFO to ignore. This code has not been tested yet.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
979
diff
changeset
|
413 CHECK_FCT( fd_msg_browse(avp, MSG_BRW_NEXT, &avp, NULL) ); |
|
80584f0e851a
Copy by default the Proxy-Info AVP included in requests into the answers. Use MSGFL_ANSW_NOPROXYINFO to ignore. This code has not been tested yet.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
979
diff
changeset
|
414 } |
|
80584f0e851a
Copy by default the Proxy-Info AVP included in requests into the answers. Use MSGFL_ANSW_NOPROXYINFO to ignore. This code has not been tested yet.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
979
diff
changeset
|
415 } |
|
80584f0e851a
Copy by default the Proxy-Info AVP included in requests into the answers. Use MSGFL_ANSW_NOPROXYINFO to ignore. This code has not been tested yet.
Sebastien Decugis <sdecugis@freediameter.net>
parents:
979
diff
changeset
|
416 |
| 0 | 417 /* associate with query */ |
| 418 ans->msg_query = qry; | |
|
637
22e8fac3b2d6
Split interface file in modules
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
400
diff
changeset
|
419 qry->msg_associated = 1; |
| 0 | 420 |
| 421 /* Done */ | |
| 422 *msg = ans; | |
| 423 return 0; | |
| 424 } | |
| 425 | |
| 426 /***************************************************************************************************************/ | |
| 427 | |
| 428 /* Explore a message */ | |
| 429 int fd_msg_browse_internal ( msg_or_avp * reference, enum msg_brw_dir dir, msg_or_avp ** found, int * depth ) | |
| 430 { | |
| 431 struct msg_avp_chain *result = NULL; | |
| 432 int diff = 0; | |
| 433 struct fd_list *li = NULL; | |
| 434 | |
| 435 TRACE_ENTRY("%p %d %p %p", reference, dir, found, depth); | |
| 436 | |
| 437 /* Initialize the "found" result if any */ | |
| 438 if (found) | |
| 439 *found = NULL; | |
| 440 | |
| 441 /* Check the parameters */ | |
| 442 CHECK_PARAMS( VALIDATE_OBJ(reference) ); | |
| 443 | |
| 444 TRACE_DEBUG(FCTS, "chaining(%p): nxt:%p prv:%p hea:%p top:%p", | |
| 445 &_C(reference)->chaining, | |
| 446 _C(reference)->chaining.next, | |
| 447 _C(reference)->chaining.prev, | |
| 448 _C(reference)->chaining.head, | |
| 449 _C(reference)->chaining.o); | |
| 450 TRACE_DEBUG(FCTS, "children(%p): nxt:%p prv:%p hea:%p top:%p", | |
| 451 &_C(reference)->children, | |
| 452 _C(reference)->children.next, | |
| 453 _C(reference)->children.prev, | |
| 454 _C(reference)->children.head, | |
| 455 _C(reference)->children.o); | |
| 456 | |
| 457 /* Now search */ | |
| 458 switch (dir) { | |
| 459 case MSG_BRW_NEXT: | |
| 460 /* Check the reference is an AVP */ | |
| 461 CHECK_PARAMS( _C(reference)->type == MSG_AVP ); | |
| 462 | |
| 463 li = &_C(reference)->chaining; | |
| 464 | |
| 465 /* Check if the next element is not the sentinel ( ==> the parent) */ | |
| 466 if (li->next != li->head) | |
| 467 result = _C(li->next->o); | |
| 468 break; | |
| 469 | |
| 470 case MSG_BRW_PREV: | |
| 471 /* Check the reference is an AVP */ | |
| 472 CHECK_PARAMS( _C(reference)->type == MSG_AVP ); | |
| 473 | |
| 474 li = &_C(reference)->chaining; | |
| 475 | |
| 476 /* Check if the prev element is not the sentinel ( ==> the parent) */ | |
| 477 if (li->prev != li->head) | |
| 478 result = _C(li->prev->o); | |
| 479 break; | |
| 480 | |
| 481 case MSG_BRW_FIRST_CHILD: | |
| 482 li = &_C(reference)->children; | |
| 483 if (! FD_IS_LIST_EMPTY(li)) { | |
| 484 result = _C(li->next->o); | |
| 485 diff = 1; | |
| 486 } | |
| 487 break; | |
| 488 | |
| 489 case MSG_BRW_LAST_CHILD: | |
| 490 li = &_C(reference)->children; | |
| 491 if (! FD_IS_LIST_EMPTY(li)) { | |
| 492 result = _C(li->prev->o); | |
| 493 diff = 1; | |
| 494 } | |
| 495 break; | |
| 496 | |
| 497 case MSG_BRW_PARENT: | |
| 498 /* If the object is not chained, it has no parent */ | |
| 499 li = &_C(reference)->chaining; | |
| 500 if (li != li->head) { | |
| 501 /* The sentinel is the parent's children list */ | |
| 502 result = _C(li->head->o); | |
| 503 diff = -1; | |
| 504 } | |
| 505 break; | |
| 506 | |
| 507 case MSG_BRW_WALK: | |
| 508 /* First, try to find a child */ | |
| 509 li = &_C(reference)->children; | |
| 510 if ( ! FD_IS_LIST_EMPTY(li) ) { | |
| 511 result = _C(li->next->o); | |
| 512 diff = 1; | |
| 513 break; | |
| 514 } | |
| 515 | |
| 516 /* Then try to find a "next" at this level or one of the parent's */ | |
| 517 li = &_C(reference)->chaining; | |
| 518 do { | |
| 519 /* If this element has a "next" element, return it */ | |
| 520 if (li->next != li->head) { | |
| 521 result = _C(li->next->o); | |
| 522 break; | |
| 523 } | |
| 524 /* otherwise, check if we have a parent */ | |
| 525 if (li == li->head) { | |
| 526 /* no parent */ | |
| 527 break; | |
| 528 } | |
| 529 /* Go to the parent's chaining information and loop */ | |
| 530 diff -= 1; | |
| 531 li = &_C(li->head->o)->chaining; | |
| 532 } while (1); | |
| 533 break; | |
| 534 | |
| 535 default: | |
| 536 /* Other directions are invalid */ | |
| 537 CHECK_PARAMS( dir = 0 ); | |
| 538 } | |
| 539 | |
| 540 /* Save the found object, if any */ | |
| 541 if (found && result) | |
| 542 *found = (void *)result; | |
| 543 | |
| 544 /* Modify the depth according to the walk direction */ | |
| 545 if (depth && diff) | |
| 546 (*depth) += diff; | |
| 547 | |
| 548 /* Return ENOENT if found was NULL */ | |
| 549 if ((!found) && (!result)) | |
| 550 return ENOENT; | |
| 551 else | |
| 552 return 0; | |
| 553 } | |
| 554 | |
| 555 /* Add an AVP into a tree */ | |
| 556 int fd_msg_avp_add ( msg_or_avp * reference, enum msg_brw_dir dir, struct avp *avp) | |
| 557 { | |
| 558 TRACE_ENTRY("%p %d %p", reference, dir, avp); | |
| 559 | |
| 560 /* Check the parameters */ | |
| 561 CHECK_PARAMS( VALIDATE_OBJ(reference) && CHECK_AVP(avp) && FD_IS_LIST_EMPTY(&avp->avp_chain.chaining) ); | |
| 562 | |
| 563 /* Now insert */ | |
| 564 switch (dir) { | |
| 565 case MSG_BRW_NEXT: | |
| 566 /* Check the reference is an AVP -- we do not chain AVPs at same level as msgs. */ | |
| 567 CHECK_PARAMS( _C(reference)->type == MSG_AVP ); | |
| 568 | |
| 569 /* Insert the new avp after the reference */ | |
| 570 fd_list_insert_after( &_A(reference)->avp_chain.chaining, &avp->avp_chain.chaining ); | |
| 571 break; | |
| 572 | |
| 573 case MSG_BRW_PREV: | |
| 574 /* Check the reference is an AVP */ | |
| 575 CHECK_PARAMS( _C(reference)->type == MSG_AVP ); | |
| 576 | |
| 577 /* Insert the new avp before the reference */ | |
| 578 fd_list_insert_before( &_A(reference)->avp_chain.chaining, &avp->avp_chain.chaining ); | |
| 579 break; | |
| 580 | |
| 581 case MSG_BRW_FIRST_CHILD: | |
| 582 /* Insert the new avp after the children sentinel */ | |
| 583 fd_list_insert_after( &_C(reference)->children, &avp->avp_chain.chaining ); | |
| 584 break; | |
| 585 | |
| 586 case MSG_BRW_LAST_CHILD: | |
| 587 /* Insert the new avp before the children sentinel */ | |
| 588 fd_list_insert_before( &_C(reference)->children, &avp->avp_chain.chaining ); | |
| 589 break; | |
| 590 | |
| 591 default: | |
| 592 /* Other directions are invalid */ | |
| 593 CHECK_PARAMS( dir = 0 ); | |
| 594 } | |
| 595 | |
| 596 return 0; | |
| 597 } | |
| 598 | |
| 599 /* Search a given AVP model in a message */ | |
| 600 int fd_msg_search_avp ( struct msg * msg, struct dict_object * what, struct avp ** avp ) | |
| 601 { | |
| 602 struct avp * nextavp; | |
| 603 struct dict_avp_data dictdata; | |
| 604 enum dict_object_type dicttype; | |
| 605 | |
| 606 TRACE_ENTRY("%p %p %p", msg, what, avp); | |
| 607 | |
| 608 CHECK_PARAMS( CHECK_MSG(msg) && what ); | |
| 609 | |
| 610 CHECK_PARAMS( (fd_dict_gettype(what, &dicttype) == 0) && (dicttype == DICT_AVP) ); | |
| 611 CHECK_FCT( fd_dict_getval(what, &dictdata) ); | |
| 612 | |
| 613 /* Loop on all top AVPs */ | |
| 614 CHECK_FCT( fd_msg_browse(msg, MSG_BRW_FIRST_CHILD, (void *)&nextavp, NULL) ); | |
| 615 while (nextavp) { | |
| 616 | |
| 617 if ( (nextavp->avp_public.avp_code == dictdata.avp_code) | |
| 618 && (nextavp->avp_public.avp_vendor == dictdata.avp_vendor) ) /* always 0 if no V flag */ | |
| 619 break; | |
| 620 | |
| 621 /* Otherwise move to next AVP in the message */ | |
| 622 CHECK_FCT( fd_msg_browse(nextavp, MSG_BRW_NEXT, (void *)&nextavp, NULL) ); | |
| 623 } | |
| 624 | |
| 625 if (avp) | |
| 626 *avp = nextavp; | |
| 627 | |
| 628 if (avp && nextavp) { | |
| 629 struct dictionary * dict; | |
| 630 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
|
631 CHECK_FCT_DO( fd_msg_parse_dict( nextavp, dict, NULL ), /* nothing */ ); |
| 0 | 632 } |
| 633 | |
| 634 if (avp || nextavp) | |
| 635 return 0; | |
| 636 else | |
| 637 return ENOENT; | |
| 638 } | |
| 639 | |
| 640 | |
| 641 /***************************************************************************************************************/ | |
| 642 /* Deleting objects */ | |
| 643 | |
| 644 /* Destroy and free an AVP or message */ | |
| 645 static int destroy_obj (struct msg_avp_chain * obj ) | |
| 646 { | |
| 647 TRACE_ENTRY("%p", obj); | |
| 648 | |
| 649 /* Check the parameter is a valid object */ | |
| 650 CHECK_PARAMS( VALIDATE_OBJ(obj) && FD_IS_LIST_EMPTY( &obj->children ) ); | |
| 651 | |
| 652 /* Unlink this object if needed */ | |
| 653 fd_list_unlink( &obj->chaining ); | |
| 654 | |
| 655 /* Free the octetstring if needed */ | |
| 656 if ((obj->type == MSG_AVP) && (_A(obj)->avp_mustfreeos == 1)) { | |
| 657 free(_A(obj)->avp_storage.os.data); | |
| 658 } | |
| 659 /* Free the rawdata if needed */ | |
| 660 if ((obj->type == MSG_AVP) && (_A(obj)->avp_rawdata != NULL)) { | |
| 661 free(_A(obj)->avp_rawdata); | |
| 662 } | |
| 663 if ((obj->type == MSG_MSG) && (_M(obj)->msg_rawbuffer != NULL)) { | |
| 664 free(_M(obj)->msg_rawbuffer); | |
| 665 } | |
| 666 | |
| 667 if ((obj->type == MSG_MSG) && (_M(obj)->msg_src_id != NULL)) { | |
| 668 free(_M(obj)->msg_src_id); | |
| 669 } | |
| 670 | |
|
83
c662d3eb6ff6
Started support for routing module
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
37
diff
changeset
|
671 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
|
672 fd_rtd_free(&_M(obj)->msg_rtdata); |
| 0 | 673 } |
| 674 | |
|
85
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
675 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
|
676 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
|
677 } |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
678 |
|
1098
f38d77f9cfd3
Initial implementation of the hook mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1096
diff
changeset
|
679 if ((obj->type == MSG_MSG) && (_M(obj)->msg_pmdl.sentinel.o != NULL)) { |
|
f38d77f9cfd3
Initial implementation of the hook mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1096
diff
changeset
|
680 ((void (*)(struct fd_msg_pmdl *))_M(obj)->msg_pmdl.sentinel.o)(&_M(obj)->msg_pmdl); |
|
f38d77f9cfd3
Initial implementation of the hook mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1096
diff
changeset
|
681 } |
|
f38d77f9cfd3
Initial implementation of the hook mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1096
diff
changeset
|
682 |
| 0 | 683 /* free the object */ |
| 684 free(obj); | |
| 685 | |
| 686 return 0; | |
| 687 } | |
| 688 | |
| 689 /* Destroy an object and all its children */ | |
| 690 static void destroy_tree(struct msg_avp_chain * obj) | |
| 691 { | |
| 692 struct fd_list *rem; | |
| 693 | |
| 694 TRACE_ENTRY("%p", obj); | |
| 695 | |
| 696 /* Destroy any subtree */ | |
| 697 while ( (rem = obj->children.next) != &obj->children) | |
| 698 destroy_tree(_C(rem->o)); | |
| 699 | |
| 700 /* Then unlink and destroy the object */ | |
| 701 CHECK_FCT_DO( destroy_obj(obj), /* nothing */ ); | |
| 702 } | |
| 703 | |
| 704 /* Free an object and its tree */ | |
| 705 int fd_msg_free ( msg_or_avp * object ) | |
| 706 { | |
| 707 TRACE_ENTRY("%p", object); | |
| 708 | |
| 709 if (CHECK_MSG(object)) { | |
| 710 if (_M(object)->msg_query) { | |
|
637
22e8fac3b2d6
Split interface file in modules
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
400
diff
changeset
|
711 _M(_M(object)->msg_query)->msg_associated = 0; |
| 0 | 712 CHECK_FCT( fd_msg_free( _M(object)->msg_query ) ); |
| 713 _M(object)->msg_query = NULL; | |
|
637
22e8fac3b2d6
Split interface file in modules
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
400
diff
changeset
|
714 } else { |
|
22e8fac3b2d6
Split interface file in modules
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
400
diff
changeset
|
715 if (_M(object)->msg_associated) { |
|
22e8fac3b2d6
Split interface file in modules
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
400
diff
changeset
|
716 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
|
717 return 0; |
|
22e8fac3b2d6
Split interface file in modules
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
400
diff
changeset
|
718 } |
| 0 | 719 } |
| 720 } | |
| 721 | |
| 722 destroy_tree(_C(object)); | |
| 723 return 0; | |
| 724 } | |
| 725 | |
| 726 | |
| 727 /***************************************************************************************************************/ | |
| 728 /* Debug functions: dumping */ | |
| 729 | |
|
1093
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
730 /* messages and AVP formatters */ |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
731 typedef DECLARE_FD_DUMP_PROTOTYPE( (*msg_dump_formatter_msg), struct msg * msg ); |
|
1095
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
732 typedef DECLARE_FD_DUMP_PROTOTYPE( (*msg_dump_formatter_avp), struct avp * avp, int level, int first, int last ); |
|
1093
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
733 |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
734 /* Core function to process the dumping */ |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
735 static DECLARE_FD_DUMP_PROTOTYPE( msg_dump_process, msg_dump_formatter_msg msg_format, msg_dump_formatter_avp avp_format, msg_or_avp *obj, struct dictionary *dict, int force_parsing, int recurse ) |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
736 { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
737 FD_DUMP_HANDLE_OFFSET(); |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
738 |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
739 if (force_parsing) { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
740 (void) fd_msg_parse_dict(obj, dict, NULL); |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
741 } |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
742 |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
743 switch (_C(obj)->type) { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
744 case MSG_AVP: |
|
1095
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
745 CHECK_MALLOC_DO( (*avp_format)(FD_DUMP_STD_PARAMS, (struct avp *)obj, 0, 1, 1), return NULL); |
|
1093
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
746 break; |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
747 |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
748 case MSG_MSG: |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
749 CHECK_MALLOC_DO( (*msg_format)(FD_DUMP_STD_PARAMS, (struct msg *)obj), return NULL); |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
750 break; |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
751 |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
752 default: |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
753 ASSERT(0); |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
754 } |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
755 |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
756 if (recurse) { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
757 struct avp * avp = NULL; |
|
1095
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
758 int first = 1; |
|
1093
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
759 CHECK_FCT_DO( fd_msg_browse ( obj, MSG_BRW_FIRST_CHILD, &avp, NULL ), avp = NULL ); |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
760 while (avp) { |
|
1095
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
761 struct avp * nextavp = NULL; |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
762 CHECK_FCT_DO( fd_msg_browse ( avp, MSG_BRW_NEXT, &nextavp, NULL ), nextavp = NULL ); |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
763 CHECK_MALLOC_DO( (*avp_format)(FD_DUMP_STD_PARAMS, avp, 1, first, nextavp ? 0 : 1), return NULL); |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
764 avp = nextavp; |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
765 first = 0; |
|
1093
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
766 }; |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
767 } |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
768 |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
769 return *buf; |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
770 } |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
771 |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
772 /* |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
773 * Tree View message dump |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
774 */ |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
775 static DECLARE_FD_DUMP_PROTOTYPE( msg_format_treeview, struct msg * msg ) |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
776 { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
777 if (!CHECK_MSG(msg)) { |
|
1095
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
778 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{message}(@%p): INVALID", msg), return NULL); |
|
1093
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
779 return *buf; |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
780 } |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
781 |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
782 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{message}(@%p): ", msg), return NULL); |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
783 if (!msg->msg_model) { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
784 if (msg->msg_model_not_found.mnf_code) { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
785 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "(not found in dictionary)\n"), return NULL); |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
786 } else { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
787 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "(not searched in dictionary)\n"), return NULL); |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
788 } |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
789 } else { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
790 enum dict_object_type dicttype; |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
791 struct dict_cmd_data dictdata; |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
792 if (fd_dict_gettype(msg->msg_model, &dicttype) || (dicttype != DICT_COMMAND)) { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
793 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "(invalid model information)\n"), return NULL); |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
794 } else if (fd_dict_getval(msg->msg_model, &dictdata)) { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
795 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "(error getting model information)\n"), return NULL); |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
796 } else { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
797 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "'%s'\n", dictdata.cmd_name), return NULL); |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
798 } |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
799 } |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
800 |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
801 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " Version: 0x%02hhX\n", msg->msg_public.msg_version), return NULL); |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
802 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " Length: %d\n", msg->msg_public.msg_length), return NULL); |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
803 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " Flags: 0x%02hhX (" DUMP_CMDFL_str ")\n", msg->msg_public.msg_flags, DUMP_CMDFL_val(msg->msg_public.msg_flags)), return NULL); |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
804 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " Command Code: %u\n", msg->msg_public.msg_code), return NULL); |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
805 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " ApplicationId: %d\n", msg->msg_public.msg_appl), return NULL); |
|
1120
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
806 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " Hop-by-Hop Identifier: 0x%08X\n", msg->msg_public.msg_hbhid), return NULL); |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
807 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " End-to-End Identifier: 0x%08X\n", msg->msg_public.msg_eteid), return NULL); |
|
1095
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
808 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " {debug data}: src:%s(%zd) rwb:%p rt:%d cb:%p,%p(%p) qry:%p asso:%d sess:%p", msg->msg_src_id?:"(nil)", msg->msg_src_id_len, msg->msg_rawbuffer, msg->msg_routable, msg->msg_cb.anscb, msg->msg_cb.expirecb, msg->msg_cb.data, msg->msg_query, msg->msg_associated, msg->msg_sess), return NULL); |
|
1093
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
809 |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
810 return *buf; |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
811 } |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
812 |
|
1095
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
813 static DECLARE_FD_DUMP_PROTOTYPE( avp_format_treeview, struct avp * avp, int level, int first, int last ) |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1084
diff
changeset
|
814 { |
|
1093
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
815 char * name; |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
816 struct dict_avp_data dictdata; |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
817 struct dict_avp_data *dictinfo = NULL; |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
818 struct dict_vendor_data vendordata; |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
819 struct dict_vendor_data *vendorinfo = NULL; |
|
1095
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
820 |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
821 if (level) { |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
822 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n"), return NULL); |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
823 } |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
824 |
|
1093
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
825 if (!CHECK_AVP(avp)) { |
|
1095
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
826 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{avp}(@%p): INVALID", avp), return NULL); |
|
1093
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
827 return *buf; |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
828 } |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
829 |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
830 if (!level) { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
831 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{avp}(@%p): ", avp), return NULL); |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
832 } else { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
833 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "%*sAVP: ", level * 3, ""), return NULL); |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
834 } |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
835 |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
836 if (!avp->avp_model) { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
837 if (avp->avp_model_not_found.mnf_code) { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
838 name = "(not found in dictionary)"; |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
839 } else { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
840 name = "(not searched in dictionary)"; |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
841 } |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
842 } else { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
843 enum dict_object_type dicttype; |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
844 if (fd_dict_gettype(avp->avp_model, &dicttype) || (dicttype != DICT_AVP)) { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
845 name = "(invalid model information)"; |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
846 } else if (fd_dict_getval(avp->avp_model, &dictdata)) { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
847 name = "(error getting model information)"; |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
848 } else { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
849 name = dictdata.avp_name; |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
850 dictinfo = &dictdata; |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
851 if (avp->avp_public.avp_flags & AVP_FLAG_VENDOR) { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
852 struct dictionary * dict; |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
853 struct dict_object * vendor; |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
854 if ((!fd_dict_getdict(avp->avp_model, &dict)) |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
855 && (!fd_dict_search(dict, DICT_VENDOR, VENDOR_OF_AVP, avp->avp_model, &vendor, ENOENT)) |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
856 && (!fd_dict_getval(vendor, &vendordata))) { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
857 vendorinfo = &vendordata; |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
858 } |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
859 } |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
860 } |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
861 } |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
862 |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
863 if (dictinfo) { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
864 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "'%s'(%u)", name, avp->avp_public.avp_code), return NULL); |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
865 } else { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
866 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "%u%s", avp->avp_public.avp_code, name), return NULL); |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
867 } |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
868 |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
869 if (avp->avp_public.avp_flags & AVP_FLAG_VENDOR) { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
870 if (vendorinfo) { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
871 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " vend='%s'(%u)", vendorinfo->vendor_name, avp->avp_public.avp_vendor), return NULL); |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
872 } else { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
873 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " vend=%u", avp->avp_public.avp_vendor), return NULL); |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
874 } |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
875 } |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
876 |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
877 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " l=%d f=" DUMP_AVPFL_str " val=", avp->avp_public.avp_len, DUMP_AVPFL_val(avp->avp_public.avp_flags)), return NULL); |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
878 |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
879 if (dictinfo && (dictinfo->avp_basetype == AVP_TYPE_GROUPED)) { |
|
1095
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
880 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "(grouped)"), return NULL); |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
881 if (level) { |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
882 struct avp * inavp = NULL; |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
883 int first = 1; |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
884 CHECK_FCT_DO( fd_msg_browse ( avp, MSG_BRW_FIRST_CHILD, &inavp, NULL ), inavp = NULL ); |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
885 while (inavp) { |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
886 struct avp * nextavp = NULL; |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
887 CHECK_FCT_DO( fd_msg_browse ( inavp, MSG_BRW_NEXT, &nextavp, NULL ), inavp = NULL ); |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
888 CHECK_MALLOC_DO( avp_format_treeview(FD_DUMP_STD_PARAMS, inavp, level + 1, first, nextavp ? 0 : 1), return NULL); |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
889 inavp = nextavp; |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
890 first = 0; |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
891 }; |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
892 } |
|
1093
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
893 } else { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
894 if (avp->avp_public.avp_value) { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
895 CHECK_MALLOC_DO( fd_dict_dump_avp_value(FD_DUMP_STD_PARAMS, avp->avp_public.avp_value, avp->avp_model, 0, 0), return NULL); |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
896 } else if (avp->avp_rawdata) { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
897 CHECK_MALLOC_DO( fd_dump_extend_hexdump(FD_DUMP_STD_PARAMS, avp->avp_rawdata, avp->avp_rawlen, 0, 0), return NULL); |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
898 } else { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
899 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "(not set)"), return NULL); |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
900 } |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
901 } |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
902 |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
903 return *buf; |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1084
diff
changeset
|
904 } |
|
1093
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
905 |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
906 /* multi-line human-readable dump similar to wireshark output */ |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
907 DECLARE_FD_DUMP_PROTOTYPE( fd_msg_dump_treeview, msg_or_avp *obj, struct dictionary *dict, int force_parsing, int recurse ) |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
908 { |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
909 return msg_dump_process(FD_DUMP_STD_PARAMS, msg_format_treeview, avp_format_treeview, obj, dict, force_parsing, recurse); |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
910 } |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
911 |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
912 |
|
1095
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
913 /* |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
914 * One-line dumper for compact but complete traces |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
915 */ |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
916 static DECLARE_FD_DUMP_PROTOTYPE( msg_format_full, struct msg * msg ) |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
917 { |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
918 int success = 0; |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
919 struct dict_cmd_data dictdata; |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
920 |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
921 if (!CHECK_MSG(msg)) { |
|
1119
79dd22145f52
Fix a number of compilation warnings
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1113
diff
changeset
|
922 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "INVALID MESSAGE"), return NULL); |
|
1095
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
923 return *buf; |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
924 } |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
925 |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
926 if (!msg->msg_model) { |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
927 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "(no model) "), return NULL); |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
928 } else { |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
929 enum dict_object_type dicttype=0; |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
930 if (fd_dict_gettype(msg->msg_model, &dicttype) || (dicttype != DICT_COMMAND)) { |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
931 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "(invalid model %d) ", dicttype), return NULL); |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
932 } else if (fd_dict_getval(msg->msg_model, &dictdata)) { |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
933 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "(error getting model data) "), return NULL); |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
934 } else { |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
935 success = 1; |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
936 } |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
937 } |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
938 if (msg->msg_public.msg_appl) { |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
939 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
940 "%s(%u/%u)[" DUMP_CMDFL_str "], Length=%u, Hop-By-Hop-Id=0x%08x, End-to-End=0x%08x", |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
941 success ? dictdata.cmd_name : "unknown", msg->msg_public.msg_appl, msg->msg_public.msg_code, DUMP_CMDFL_val(msg->msg_public.msg_flags), |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
942 msg->msg_public.msg_length, msg->msg_public.msg_hbhid, msg->msg_public.msg_eteid), return NULL); |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
943 } else { |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
944 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
945 "%s(%u)[" DUMP_CMDFL_str "], Length=%u, Hop-By-Hop-Id=0x%08x, End-to-End=0x%08x", |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
946 success ? dictdata.cmd_name : "unknown", msg->msg_public.msg_code, DUMP_CMDFL_val(msg->msg_public.msg_flags), |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
947 msg->msg_public.msg_length, msg->msg_public.msg_hbhid, msg->msg_public.msg_eteid), return NULL); |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
948 } |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
949 return *buf; |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
950 } |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
951 |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
952 static DECLARE_FD_DUMP_PROTOTYPE( avp_format_full, struct avp * avp, int level, int first, int last ) |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
953 { |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
954 int success = 0; |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
955 struct dict_avp_data dictdata; |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
956 |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
957 if (level) { |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
958 if ((first) && ((*buf)[*offset - 1] == '=')) { |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
959 /* We are first AVP of a grouped AVP */ |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
960 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{ "), return NULL); |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
961 } else { |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
962 /* We follow another AVP, or a message header */ |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
963 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, ", { "), return NULL); |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
964 } |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
965 } |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
966 |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
967 if (!CHECK_AVP(avp)) { |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
968 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "INVALID AVP"), return NULL); |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
969 goto end; |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
970 } |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
971 |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
972 |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
973 if (avp->avp_model) { |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
974 enum dict_object_type dicttype; |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
975 if (fd_dict_gettype(avp->avp_model, &dicttype) || (dicttype != DICT_AVP)) { |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
976 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "(invalid model: %d) ", dicttype), return NULL); |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
977 } else if (fd_dict_getval(avp->avp_model, &dictdata)) { |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
978 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "(error getting model data) "), return NULL); |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
979 } else { |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
980 success = 1; |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
981 } |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
982 } |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
983 |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
984 if (avp->avp_public.avp_flags & AVP_FLAG_VENDOR) { |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
985 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "%s(%u/%u)[" DUMP_AVPFL_str "]=", |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
986 success ? dictdata.avp_name : "unknown", avp->avp_public.avp_vendor, avp->avp_public.avp_code, DUMP_AVPFL_val(avp->avp_public.avp_flags)), return NULL); |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
987 } else { |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
988 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "%s(%u)[" DUMP_AVPFL_str "]=", |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
989 success ? dictdata.avp_name : "unknown", avp->avp_public.avp_code, DUMP_AVPFL_val(avp->avp_public.avp_flags)), return NULL); |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
990 } |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
991 |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
992 |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
993 if (success && (dictdata.avp_basetype == AVP_TYPE_GROUPED)) { |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
994 if (level) { |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
995 struct avp * inavp = NULL; |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
996 int first = 1; |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
997 CHECK_FCT_DO( fd_msg_browse ( avp, MSG_BRW_FIRST_CHILD, &inavp, NULL ), inavp = NULL ); |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
998 while (inavp) { |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
999 struct avp * nextavp = NULL; |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
1000 CHECK_FCT_DO( fd_msg_browse ( inavp, MSG_BRW_NEXT, &nextavp, NULL ), inavp = NULL ); |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
1001 CHECK_MALLOC_DO( avp_format_full(FD_DUMP_STD_PARAMS, inavp, level + 1, first, nextavp ? 0 : 1), return NULL); |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
1002 inavp = nextavp; |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
1003 first = 0; |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
1004 }; |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
1005 } |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
1006 } else { |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
1007 if (avp->avp_public.avp_value) { |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
1008 CHECK_MALLOC_DO( fd_dict_dump_avp_value(FD_DUMP_STD_PARAMS, avp->avp_public.avp_value, avp->avp_model, 0, 0), return NULL); |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
1009 } else if (avp->avp_rawdata) { |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
1010 CHECK_MALLOC_DO( fd_dump_extend_hexdump(FD_DUMP_STD_PARAMS, avp->avp_rawdata, avp->avp_rawlen, 0, 0), return NULL); |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
1011 } else { |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
1012 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "(not set)"), return NULL); |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
1013 } |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
1014 } |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
1015 |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
1016 end: |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
1017 if (level) { |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
1018 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " }"), return NULL); |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
1019 } |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
1020 |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
1021 return *buf; |
|
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
1022 } |
|
1096
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1023 |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1084
diff
changeset
|
1024 /* one-line dump with all the contents of the message */ |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1084
diff
changeset
|
1025 DECLARE_FD_DUMP_PROTOTYPE( fd_msg_dump_full, msg_or_avp *obj, struct dictionary *dict, int force_parsing, int recurse ) |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1084
diff
changeset
|
1026 { |
|
1095
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
1027 return msg_dump_process(FD_DUMP_STD_PARAMS, msg_format_full, avp_format_full, obj, dict, force_parsing, recurse); |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1084
diff
changeset
|
1028 } |
|
1093
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
1029 |
|
1096
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1030 |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1031 |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1032 /* |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1033 * One-line dumper for compact but complete traces |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1034 */ |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1035 static DECLARE_FD_DUMP_PROTOTYPE( msg_format_summary, struct msg * msg ) |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1036 { |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1037 if (!CHECK_MSG(msg)) { |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1038 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{message}(@%p): INVALID", msg), return NULL); |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1039 return *buf; |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1040 } |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1041 |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1042 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{message}(@%p): ", msg), return NULL); |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1043 if (!msg->msg_model) { |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1044 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "(no model)"), return NULL); |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1045 } else { |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1046 enum dict_object_type dicttype; |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1047 struct dict_cmd_data dictdata; |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1048 if (fd_dict_gettype(msg->msg_model, &dicttype) || (dicttype != DICT_COMMAND) || (fd_dict_getval(msg->msg_model, &dictdata))) { |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1049 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "(model error)"), return NULL); |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1050 } else { |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1051 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "'%s'", dictdata.cmd_name), return NULL); |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1052 } |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1053 } |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1054 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "%u/%u f:" DUMP_CMDFL_str " src:'%s' len:%d", |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1055 msg->msg_public.msg_appl, msg->msg_public.msg_code, DUMP_CMDFL_val(msg->msg_public.msg_flags), msg->msg_src_id?:"(nil)", msg->msg_public.msg_length), return NULL); |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1056 |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1057 return *buf; |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1058 } |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1059 |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1060 static DECLARE_FD_DUMP_PROTOTYPE( avp_format_summary, struct avp * avp, int level, int first, int last ) |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1061 { |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1062 char * name; |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1063 struct dict_avp_data dictdata; |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1064 struct dict_avp_data *dictinfo = NULL; |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1065 struct dict_vendor_data vendordata; |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1066 struct dict_vendor_data *vendorinfo = NULL; |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1067 |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1068 if (level) { |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1069 if (first) { |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1070 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " {"), return NULL); |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1071 } else { |
|
1120
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1072 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, ","), return NULL); |
|
1096
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1073 } |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1074 } |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1075 |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1076 if (!CHECK_AVP(avp)) { |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1077 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "INVALID"), return NULL); |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1078 goto end; |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1079 } |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1080 |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1081 if (!level) { |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1082 /* We have been called to explicitely dump this AVP, so we parse its name if available */ |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1083 if (!avp->avp_model) { |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1084 name = "(no model)"; |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1085 } else { |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1086 enum dict_object_type dicttype; |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1087 if (fd_dict_gettype(avp->avp_model, &dicttype) || (dicttype != DICT_AVP) || (fd_dict_getval(avp->avp_model, &dictdata))) { |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1088 name = "(model error)"; |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1089 } else { |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1090 name = dictdata.avp_name; |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1091 dictinfo = &dictdata; |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1092 if (avp->avp_public.avp_flags & AVP_FLAG_VENDOR) { |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1093 struct dictionary * dict; |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1094 struct dict_object * vendor; |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1095 if ((!fd_dict_getdict(avp->avp_model, &dict)) |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1096 && (!fd_dict_search(dict, DICT_VENDOR, VENDOR_OF_AVP, avp->avp_model, &vendor, ENOENT)) |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1097 && (!fd_dict_getval(vendor, &vendordata))) { |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1098 vendorinfo = &vendordata; |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1099 } |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1100 } |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1101 } |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1102 } |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1103 |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1104 if (dictinfo) { |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1105 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "'%s'(%u)", name, avp->avp_public.avp_code), return NULL); |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1106 } else { |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1107 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "%u%s", avp->avp_public.avp_code, name), return NULL); |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1108 } |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1109 |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1110 if (avp->avp_public.avp_flags & AVP_FLAG_VENDOR) { |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1111 if (vendorinfo) { |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1112 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " V='%s'(%u)", vendorinfo->vendor_name, avp->avp_public.avp_vendor), return NULL); |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1113 } else { |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1114 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " V=%u", avp->avp_public.avp_vendor), return NULL); |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1115 } |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1116 } |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1117 |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1118 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " L=%d F=" DUMP_AVPFL_str " V=", avp->avp_public.avp_len, DUMP_AVPFL_val(avp->avp_public.avp_flags)), return NULL); |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1119 |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1120 if ((!dictinfo) || (dictinfo->avp_basetype != AVP_TYPE_GROUPED)) { |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1121 if (avp->avp_public.avp_value) { |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1122 CHECK_MALLOC_DO( fd_dict_dump_avp_value(FD_DUMP_STD_PARAMS, avp->avp_public.avp_value, avp->avp_model, 0, 0), return NULL); |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1123 } else if (avp->avp_rawdata) { |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1124 CHECK_MALLOC_DO( fd_dump_extend_hexdump(FD_DUMP_STD_PARAMS, avp->avp_rawdata, avp->avp_rawlen, 0, 0), return NULL); |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1125 } else { |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1126 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "(not set)"), return NULL); |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1127 } |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1128 } |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1129 } else { |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1130 /* For embedded AVPs, we only display (vendor,) code & length */ |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1131 if (avp->avp_public.avp_flags & AVP_FLAG_VENDOR) { |
|
1120
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1132 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "V:%u/", avp->avp_public.avp_vendor), return NULL); |
|
1096
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1133 } |
|
1120
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1134 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "C:%u/l:%d", avp->avp_public.avp_code, avp->avp_public.avp_len), return NULL); |
|
1096
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1135 } |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1136 |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1137 end: |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1138 if ((level) && (last)) { |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1139 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "}"), return NULL); |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1140 } |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1141 |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1142 return *buf; |
|
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1143 } |
|
1095
647c7e7015af
Ported the fd_msg_dump_full function to the new mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1093
diff
changeset
|
1144 |
|
1093
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
1145 /* This one only prints a short display, does not go into the complete tree */ |
|
44f3e48dfe27
Align the behavior of all fd_*dump functions wrt final \n
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1092
diff
changeset
|
1146 DECLARE_FD_DUMP_PROTOTYPE( fd_msg_dump_summary, msg_or_avp *obj, struct dictionary *dict, int force_parsing, int recurse ) |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1084
diff
changeset
|
1147 { |
|
1096
97a257c80de0
Implemented remaining flavour of message dump function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1095
diff
changeset
|
1148 return msg_dump_process(FD_DUMP_STD_PARAMS, msg_format_summary, avp_format_summary, obj, dict, force_parsing, recurse); |
|
1085
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1084
diff
changeset
|
1149 } |
|
7d7266115a34
Cleaning of the traces in progress
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1084
diff
changeset
|
1150 |
| 0 | 1151 /***************************************************************************************************************/ |
| 1152 /* Simple meta-data management */ | |
| 1153 | |
| 1154 /* Retrieve the model of an object */ | |
| 1155 int fd_msg_model ( msg_or_avp * reference, struct dict_object ** model ) | |
| 1156 { | |
| 1157 TRACE_ENTRY("%p %p", reference, model); | |
| 1158 | |
| 1159 /* Check the parameters */ | |
| 1160 CHECK_PARAMS( model && VALIDATE_OBJ(reference) ); | |
| 1161 | |
| 1162 /* copy the model reference */ | |
| 1163 switch (_C(reference)->type) { | |
| 1164 case MSG_AVP: | |
| 1165 *model = _A(reference)->avp_model; | |
| 1166 break; | |
| 1167 | |
| 1168 case MSG_MSG: | |
| 1169 *model = _M(reference)->msg_model; | |
| 1170 break; | |
| 1171 | |
| 1172 default: | |
| 1173 CHECK_PARAMS(0); | |
| 1174 } | |
| 1175 | |
| 1176 return 0; | |
| 1177 } | |
| 1178 | |
| 1179 /* Retrieve the address of the msg_public field of a message */ | |
| 1180 int fd_msg_hdr ( struct msg *msg, struct msg_hdr **pdata ) | |
| 1181 { | |
| 1182 TRACE_ENTRY("%p %p", msg, pdata); | |
| 1183 CHECK_PARAMS( CHECK_MSG(msg) && pdata ); | |
| 1184 | |
| 1185 *pdata = &msg->msg_public; | |
| 1186 return 0; | |
| 1187 } | |
| 1188 | |
| 1189 /* Retrieve the address of the avp_public field of an avp */ | |
| 1190 int fd_msg_avp_hdr ( struct avp *avp, struct avp_hdr **pdata ) | |
| 1191 { | |
| 1192 TRACE_ENTRY("%p %p", avp, pdata); | |
| 1193 CHECK_PARAMS( CHECK_AVP(avp) && pdata ); | |
| 1194 | |
| 1195 *pdata = &avp->avp_public; | |
| 1196 return 0; | |
| 1197 } | |
| 1198 | |
| 1199 /* Associate answers and queries */ | |
| 1200 int fd_msg_answ_associate( struct msg * answer, struct msg * query ) | |
| 1201 { | |
| 1202 TRACE_ENTRY( "%p %p", answer, query ); | |
| 1203 | |
| 1204 CHECK_PARAMS( CHECK_MSG(answer) && CHECK_MSG(query) && (answer->msg_query == NULL ) ); | |
| 1205 | |
| 1206 answer->msg_query = query; | |
|
637
22e8fac3b2d6
Split interface file in modules
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
400
diff
changeset
|
1207 query->msg_associated = 1; |
| 0 | 1208 |
| 1209 return 0; | |
| 1210 } | |
| 1211 | |
| 1212 int fd_msg_answ_getq( struct msg * answer, struct msg ** query ) | |
| 1213 { | |
| 1214 TRACE_ENTRY( "%p %p", answer, query ); | |
| 1215 | |
| 1216 CHECK_PARAMS( CHECK_MSG(answer) && query ); | |
| 1217 | |
| 1218 *query = answer->msg_query; | |
| 1219 | |
| 1220 return 0; | |
| 1221 } | |
| 1222 | |
| 1223 int fd_msg_answ_detach( struct msg * answer ) | |
| 1224 { | |
| 1225 TRACE_ENTRY( "%p", answer ); | |
| 1226 | |
| 1227 CHECK_PARAMS( CHECK_MSG(answer) ); | |
| 1228 | |
|
637
22e8fac3b2d6
Split interface file in modules
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
400
diff
changeset
|
1229 answer->msg_query->msg_associated = 0; |
| 0 | 1230 answer->msg_query = NULL; |
| 1231 | |
| 1232 return 0; | |
| 1233 } | |
| 1234 | |
| 1235 /* Associate / get answer callbacks */ | |
|
1014
908ffbb81f60
Added a second callback in fd_msg_send_timeout to handle more easily the timeout situation
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1009
diff
changeset
|
1236 int fd_msg_anscb_associate( struct msg * msg, void ( *anscb)(void *, struct msg **), void * data, void (*expirecb)(void *, DiamId_t, size_t, struct msg **), const struct timespec *timeout ) |
| 0 | 1237 { |
|
1014
908ffbb81f60
Added a second callback in fd_msg_send_timeout to handle more easily the timeout situation
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1009
diff
changeset
|
1238 TRACE_ENTRY("%p %p %p %p", msg, anscb, expirecb, data); |
| 0 | 1239 |
| 1240 /* Check the parameters */ | |
|
824
89c5849b0832
Allow retransmission of messages on timeout
Sebastien Decugis <sdecugis@freediameter.net>
parents:
808
diff
changeset
|
1241 CHECK_PARAMS( CHECK_MSG(msg) ); |
|
893
8187364e39ea
Fix answers sending
Sebastien Decugis <sdecugis@freediameter.net>
parents:
892
diff
changeset
|
1242 |
|
8187364e39ea
Fix answers sending
Sebastien Decugis <sdecugis@freediameter.net>
parents:
892
diff
changeset
|
1243 if (! (msg->msg_public.msg_flags & CMD_FLAG_REQUEST )) |
|
1009
e22434c66126
Be more restrictive on fd_msg_send() called with answer messages, the function now rejects the parameters if an answer callback is provided
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1005
diff
changeset
|
1244 return anscb ? EINVAL : 0; /* we associate with requests only */ |
|
893
8187364e39ea
Fix answers sending
Sebastien Decugis <sdecugis@freediameter.net>
parents:
892
diff
changeset
|
1245 |
| 1099 | 1246 CHECK_PARAMS( (anscb == NULL) || (msg->msg_cb.anscb == NULL) ); /* We are not overwriting a cb */ |
| 1247 CHECK_PARAMS( (expirecb == NULL) || (msg->msg_cb.expirecb == NULL) ); /* We are not overwriting a cb */ | |
| 0 | 1248 |
| 1249 /* Associate callback and data with the message, if any */ | |
|
1014
908ffbb81f60
Added a second callback in fd_msg_send_timeout to handle more easily the timeout situation
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1009
diff
changeset
|
1250 msg->msg_cb.anscb = anscb; |
|
908ffbb81f60
Added a second callback in fd_msg_send_timeout to handle more easily the timeout situation
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1009
diff
changeset
|
1251 msg->msg_cb.expirecb = expirecb; |
| 0 | 1252 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
|
1253 if (timeout) { |
|
cfc8da9264f4
Prepared first part of the changes for #10
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
638
diff
changeset
|
1254 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
|
1255 } |
| 0 | 1256 |
| 1257 return 0; | |
| 1258 } | |
| 1259 | |
|
1014
908ffbb81f60
Added a second callback in fd_msg_send_timeout to handle more easily the timeout situation
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1009
diff
changeset
|
1260 int fd_msg_anscb_get( struct msg * msg, void (**anscb)(void *, struct msg **), void (**expirecb)(void *, DiamId_t, size_t, struct msg **), void ** data ) |
| 0 | 1261 { |
|
1014
908ffbb81f60
Added a second callback in fd_msg_send_timeout to handle more easily the timeout situation
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1009
diff
changeset
|
1262 TRACE_ENTRY("%p %p %p %p", msg, anscb, expirecb, data); |
| 0 | 1263 |
| 1264 /* Check the parameters */ | |
|
1014
908ffbb81f60
Added a second callback in fd_msg_send_timeout to handle more easily the timeout situation
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1009
diff
changeset
|
1265 CHECK_PARAMS( CHECK_MSG(msg) ); |
| 0 | 1266 |
| 1267 /* Copy the result */ | |
|
1014
908ffbb81f60
Added a second callback in fd_msg_send_timeout to handle more easily the timeout situation
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1009
diff
changeset
|
1268 if (anscb) |
|
908ffbb81f60
Added a second callback in fd_msg_send_timeout to handle more easily the timeout situation
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1009
diff
changeset
|
1269 *anscb = msg->msg_cb.anscb; |
|
908ffbb81f60
Added a second callback in fd_msg_send_timeout to handle more easily the timeout situation
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1009
diff
changeset
|
1270 if (data) |
|
908ffbb81f60
Added a second callback in fd_msg_send_timeout to handle more easily the timeout situation
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1009
diff
changeset
|
1271 *data = msg->msg_cb.data; |
|
908ffbb81f60
Added a second callback in fd_msg_send_timeout to handle more easily the timeout situation
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1009
diff
changeset
|
1272 if (expirecb) |
|
908ffbb81f60
Added a second callback in fd_msg_send_timeout to handle more easily the timeout situation
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1009
diff
changeset
|
1273 *expirecb = msg->msg_cb.expirecb; |
| 0 | 1274 |
| 1275 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
|
1276 } |
|
5e5d8152c229
Implemented fd_msg_send_timeout to close #10. Not tested yet.
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
648
diff
changeset
|
1277 |
|
5e5d8152c229
Implemented fd_msg_send_timeout to close #10. Not tested yet.
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
648
diff
changeset
|
1278 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
|
1279 { |
|
5e5d8152c229
Implemented fd_msg_send_timeout to close #10. Not tested yet.
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
648
diff
changeset
|
1280 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
|
1281 |
|
5e5d8152c229
Implemented fd_msg_send_timeout to close #10. Not tested yet.
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
648
diff
changeset
|
1282 /* 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
|
1283 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
|
1284 |
|
5e5d8152c229
Implemented fd_msg_send_timeout to close #10. Not tested yet.
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
648
diff
changeset
|
1285 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
|
1286 return NULL; |
|
5e5d8152c229
Implemented fd_msg_send_timeout to close #10. Not tested yet.
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
648
diff
changeset
|
1287 } |
|
5e5d8152c229
Implemented fd_msg_send_timeout to close #10. Not tested yet.
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
648
diff
changeset
|
1288 |
|
5e5d8152c229
Implemented fd_msg_send_timeout to close #10. Not tested yet.
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
648
diff
changeset
|
1289 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
|
1290 } |
| 0 | 1291 |
| 1292 /* Associate routing lists */ | |
|
83
c662d3eb6ff6
Started support for routing module
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
37
diff
changeset
|
1293 int fd_msg_rt_associate( struct msg * msg, struct rt_data ** rtd ) |
| 0 | 1294 { |
|
83
c662d3eb6ff6
Started support for routing module
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
37
diff
changeset
|
1295 TRACE_ENTRY( "%p %p", msg, rtd ); |
| 0 | 1296 |
|
83
c662d3eb6ff6
Started support for routing module
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
37
diff
changeset
|
1297 CHECK_PARAMS( CHECK_MSG(msg) && rtd ); |
| 0 | 1298 |
|
83
c662d3eb6ff6
Started support for routing module
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
37
diff
changeset
|
1299 msg->msg_rtdata = *rtd; |
|
c662d3eb6ff6
Started support for routing module
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
37
diff
changeset
|
1300 *rtd = NULL; |
| 0 | 1301 |
| 1302 return 0; | |
| 1303 } | |
| 1304 | |
|
83
c662d3eb6ff6
Started support for routing module
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
37
diff
changeset
|
1305 int fd_msg_rt_get( struct msg * msg, struct rt_data ** rtd ) |
| 0 | 1306 { |
|
83
c662d3eb6ff6
Started support for routing module
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
37
diff
changeset
|
1307 TRACE_ENTRY( "%p %p", msg, rtd ); |
| 0 | 1308 |
|
83
c662d3eb6ff6
Started support for routing module
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
37
diff
changeset
|
1309 CHECK_PARAMS( CHECK_MSG(msg) && rtd ); |
| 0 | 1310 |
|
83
c662d3eb6ff6
Started support for routing module
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
37
diff
changeset
|
1311 *rtd = msg->msg_rtdata; |
|
c662d3eb6ff6
Started support for routing module
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
37
diff
changeset
|
1312 msg->msg_rtdata = NULL; |
| 0 | 1313 |
| 1314 return 0; | |
| 1315 } | |
| 1316 | |
| 1317 /* Find if a message is routable */ | |
| 1318 int fd_msg_is_routable ( struct msg * msg ) | |
| 1319 { | |
| 1320 TRACE_ENTRY("%p", msg); | |
| 1321 | |
| 1322 CHECK_PARAMS_DO( CHECK_MSG(msg), return 0 /* pretend the message is not routable */ ); | |
| 1323 | |
| 1324 if ( ! msg->msg_routable ) { | |
|
37
cc3c59fe98fe
Lot of cleanups in peer structure management
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
35
diff
changeset
|
1325 /* 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
|
1326 msg->msg_routable = ((msg->msg_public.msg_appl != 0) || (msg->msg_public.msg_flags & CMD_FLAG_PROXIABLE)) ? 1 : 2; |
| 0 | 1327 |
| 1328 /* Note : the 'real' criteria according to the Diameter I-D is that the message is | |
| 1329 routable if and only if the "Destination-Realm" AVP is required by the command ABNF. | |
| 1330 We could make a test for this here, but it's more computational work and our test | |
| 1331 seems accurate (until proven otherwise...) */ | |
| 1332 } | |
| 1333 | |
| 1334 return (msg->msg_routable == 1) ? 1 : 0; | |
| 1335 } | |
| 1336 | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
704
diff
changeset
|
1337 /* 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
|
1338 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
|
1339 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
|
1340 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
|
1341 |
| 0 | 1342 /* Associate source peer */ |
|
1120
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1343 int fd_msg_source_set( struct msg * msg, DiamId_t diamid, size_t diamidlen ) |
| 0 | 1344 { |
|
1120
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1345 TRACE_ENTRY( "%p %p %zd", msg, diamid, diamidlen); |
| 0 | 1346 |
| 1347 /* Check we received a valid message */ | |
|
1120
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1348 CHECK_PARAMS( CHECK_MSG(msg) ); |
| 0 | 1349 |
| 1350 /* Cleanup any previous source */ | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
704
diff
changeset
|
1351 free(msg->msg_src_id); msg->msg_src_id = NULL; msg->msg_src_id_len = 0; |
| 0 | 1352 |
| 1353 /* If the request is to cleanup the source, we are done */ | |
| 1354 if (diamid == NULL) { | |
| 1355 return 0; | |
| 1356 } | |
| 1357 | |
| 1358 /* Otherwise save the new informations */ | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
704
diff
changeset
|
1359 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
|
1360 msg->msg_src_id_len = diamidlen; |
|
1120
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1361 /* done */ |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1362 return 0; |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1363 } |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1364 |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1365 /* Associate source peer */ |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1366 int fd_msg_source_setrr( struct msg * msg, DiamId_t diamid, size_t diamidlen, struct dictionary * dict ) |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1367 { |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1368 struct dict_object *avp_rr_model = NULL; |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1369 avp_code_t code = AC_ROUTE_RECORD; |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1370 struct avp *avp; |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1371 union avp_value val; |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1372 |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1373 TRACE_ENTRY( "%p %p %zd %p", msg, diamid, diamidlen, dict); |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
704
diff
changeset
|
1374 |
|
1120
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1375 /* Check we received a valid message */ |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1376 CHECK_PARAMS( CHECK_MSG(msg) && dict ); |
| 0 | 1377 |
|
1120
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1378 /* Lock the cached values */ |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1379 CHECK_POSIX( pthread_mutex_lock(&cached_avp_rr_lock) ); |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1380 if (cached_avp_rr_dict == dict) { |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1381 avp_rr_model = cached_avp_rr_model; |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1382 } |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1383 CHECK_POSIX( pthread_mutex_unlock(&cached_avp_rr_lock) ); |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1384 |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1385 /* If it was not cached */ |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1386 if (!avp_rr_model) { |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1387 /* Find the model for Route-Record in the dictionary */ |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1388 CHECK_FCT( fd_dict_search ( dict, DICT_AVP, AVP_BY_CODE, &code, &avp_rr_model, ENOENT) ); |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1389 |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1390 /* Now cache this result */ |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
704
diff
changeset
|
1391 CHECK_POSIX( pthread_mutex_lock(&cached_avp_rr_lock) ); |
|
1120
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1392 cached_avp_rr_dict = dict; |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1393 cached_avp_rr_model = avp_rr_model; |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
704
diff
changeset
|
1394 CHECK_POSIX( pthread_mutex_unlock(&cached_avp_rr_lock) ); |
|
1120
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1395 } |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1396 |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1397 /* Create the AVP with this model */ |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1398 CHECK_FCT( fd_msg_avp_new ( avp_rr_model, 0, &avp ) ); |
| 0 | 1399 |
|
1120
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1400 /* Set the AVP value with the diameter id */ |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1401 memset(&val, 0, sizeof(val)); |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1402 val.os.data = (uint8_t *)diamid; |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1403 val.os.len = diamidlen; |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1404 CHECK_FCT( fd_msg_avp_setvalue( avp, &val ) ); |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1405 |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1406 /* Add the AVP in the message */ |
|
c473581adff2
Cleanup some traces
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1119
diff
changeset
|
1407 CHECK_FCT( fd_msg_avp_add( msg, MSG_BRW_LAST_CHILD, avp ) ); |
| 0 | 1408 |
| 1409 /* done */ | |
| 1410 return 0; | |
| 1411 } | |
| 1412 | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
704
diff
changeset
|
1413 int fd_msg_source_get( struct msg * msg, DiamId_t* diamid, size_t * diamidlen ) |
| 0 | 1414 { |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
704
diff
changeset
|
1415 TRACE_ENTRY( "%p %p %p", msg, diamid, diamidlen); |
| 0 | 1416 |
| 1417 /* Check we received valid parameters */ | |
| 1418 CHECK_PARAMS( CHECK_MSG(msg) ); | |
| 1419 CHECK_PARAMS( diamid ); | |
| 1420 | |
| 1421 /* Copy the informations */ | |
| 1422 *diamid = msg->msg_src_id; | |
| 1423 | |
|
706
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
704
diff
changeset
|
1424 if (diamidlen) |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
704
diff
changeset
|
1425 *diamidlen = msg->msg_src_id_len; |
|
4ffbc9f1e922
Large UNTESTED commit with the following changes:
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
704
diff
changeset
|
1426 |
| 0 | 1427 /* done */ |
| 1428 return 0; | |
| 1429 } | |
| 1430 | |
|
924
877592751fee
Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much
Sebastien Decugis <sdecugis@freediameter.net>
parents:
920
diff
changeset
|
1431 /* Associate a session with a message, use only when the session was just created */ |
|
877592751fee
Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much
Sebastien Decugis <sdecugis@freediameter.net>
parents:
920
diff
changeset
|
1432 int fd_msg_sess_set(struct msg * msg, struct session * session) |
|
877592751fee
Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much
Sebastien Decugis <sdecugis@freediameter.net>
parents:
920
diff
changeset
|
1433 { |
|
877592751fee
Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much
Sebastien Decugis <sdecugis@freediameter.net>
parents:
920
diff
changeset
|
1434 TRACE_ENTRY("%p %p", msg, session); |
|
877592751fee
Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much
Sebastien Decugis <sdecugis@freediameter.net>
parents:
920
diff
changeset
|
1435 |
|
877592751fee
Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much
Sebastien Decugis <sdecugis@freediameter.net>
parents:
920
diff
changeset
|
1436 /* Check we received valid parameters */ |
|
877592751fee
Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much
Sebastien Decugis <sdecugis@freediameter.net>
parents:
920
diff
changeset
|
1437 CHECK_PARAMS( CHECK_MSG(msg) ); |
|
877592751fee
Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much
Sebastien Decugis <sdecugis@freediameter.net>
parents:
920
diff
changeset
|
1438 CHECK_PARAMS( session ); |
|
877592751fee
Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much
Sebastien Decugis <sdecugis@freediameter.net>
parents:
920
diff
changeset
|
1439 CHECK_PARAMS( msg->msg_sess == NULL ); |
|
877592751fee
Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much
Sebastien Decugis <sdecugis@freediameter.net>
parents:
920
diff
changeset
|
1440 |
|
877592751fee
Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much
Sebastien Decugis <sdecugis@freediameter.net>
parents:
920
diff
changeset
|
1441 msg->msg_sess = session; |
|
877592751fee
Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much
Sebastien Decugis <sdecugis@freediameter.net>
parents:
920
diff
changeset
|
1442 return 0; |
|
877592751fee
Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much
Sebastien Decugis <sdecugis@freediameter.net>
parents:
920
diff
changeset
|
1443 } |
|
877592751fee
Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much
Sebastien Decugis <sdecugis@freediameter.net>
parents:
920
diff
changeset
|
1444 |
|
895
fbf77629cb7b
Added received and sent timestamps in the messages; added logs on emission and reception
Sebastien Decugis <sdecugis@freediameter.net>
parents:
894
diff
changeset
|
1445 |
|
85
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1446 /* 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
|
1447 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
|
1448 { |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1449 struct avp * avp; |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1450 |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1451 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
|
1452 |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1453 /* Check we received valid parameters */ |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1454 CHECK_PARAMS( CHECK_MSG(msg) ); |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1455 CHECK_PARAMS( session ); |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1456 |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1457 /* 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
|
1458 if (msg->msg_sess) { |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1459 *session = msg->msg_sess; |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1460 if (new) |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1461 *new = 0; |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1462 return 0; |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1463 } |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1464 |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1465 /* 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
|
1466 /* -- 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
|
1467 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
|
1468 while (avp) { |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1469 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
|
1470 && (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
|
1471 break; |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1472 |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1473 /* 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
|
1474 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
|
1475 } |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1476 |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1477 if (!avp) { |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1478 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
|
1479 *session = NULL; |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1480 return 0; |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1481 } |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1482 |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1483 if (!avp->avp_model) { |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
1484 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
|
1485 } |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1486 |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1487 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
|
1488 |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1489 /* Resolve the session and we are done */ |
|
919
b1776283d69e
Do not kill framework when a message with 0b session-id is dispatched
Sebastien Decugis <sdecugis@freediameter.net>
parents:
916
diff
changeset
|
1490 if (avp->avp_public.avp_value->os.len > 0) { |
|
b1776283d69e
Do not kill framework when a message with 0b session-id is dispatched
Sebastien Decugis <sdecugis@freediameter.net>
parents:
916
diff
changeset
|
1491 CHECK_FCT( fd_sess_fromsid_msg ( avp->avp_public.avp_value->os.data, avp->avp_public.avp_value->os.len, &msg->msg_sess, new) ); |
|
b1776283d69e
Do not kill framework when a message with 0b session-id is dispatched
Sebastien Decugis <sdecugis@freediameter.net>
parents:
916
diff
changeset
|
1492 *session = msg->msg_sess; |
|
b1776283d69e
Do not kill framework when a message with 0b session-id is dispatched
Sebastien Decugis <sdecugis@freediameter.net>
parents:
916
diff
changeset
|
1493 } else { |
|
b1776283d69e
Do not kill framework when a message with 0b session-id is dispatched
Sebastien Decugis <sdecugis@freediameter.net>
parents:
916
diff
changeset
|
1494 TRACE_DEBUG(FULL, "Session-Id AVP with 0-byte length found in message %p", msg); |
|
b1776283d69e
Do not kill framework when a message with 0b session-id is dispatched
Sebastien Decugis <sdecugis@freediameter.net>
parents:
916
diff
changeset
|
1495 *session = NULL; |
|
b1776283d69e
Do not kill framework when a message with 0b session-id is dispatched
Sebastien Decugis <sdecugis@freediameter.net>
parents:
916
diff
changeset
|
1496 } |
|
85
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1497 |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1498 return 0; |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1499 } |
|
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1500 |
|
1098
f38d77f9cfd3
Initial implementation of the hook mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1096
diff
changeset
|
1501 /* Retrieve the location of the pmd list for the message; return NULL if failed */ |
|
f38d77f9cfd3
Initial implementation of the hook mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1096
diff
changeset
|
1502 struct fd_msg_pmdl * fd_msg_pmdl_get(struct msg * msg) |
|
f38d77f9cfd3
Initial implementation of the hook mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1096
diff
changeset
|
1503 { |
|
f38d77f9cfd3
Initial implementation of the hook mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1096
diff
changeset
|
1504 CHECK_PARAMS_DO( CHECK_MSG(msg), return NULL ); |
|
f38d77f9cfd3
Initial implementation of the hook mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1096
diff
changeset
|
1505 return &msg->msg_pmdl; |
|
f38d77f9cfd3
Initial implementation of the hook mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1096
diff
changeset
|
1506 } |
|
f38d77f9cfd3
Initial implementation of the hook mechanism
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1096
diff
changeset
|
1507 |
|
85
e5fcd672caff
Added new function to retrieve messages sessions easily
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
83
diff
changeset
|
1508 |
| 0 | 1509 /******************* 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
|
1510 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
|
1511 static pthread_mutex_t fd_eteid_lck = PTHREAD_MUTEX_INITIALIZER; |
| 0 | 1512 |
| 1513 void fd_msg_eteid_init(void) | |
| 1514 { | |
| 1515 fd_eteid = ((uint32_t)time(NULL) << 20) | ((uint32_t)lrand48() & ( (1 << 20) - 1 )); | |
| 1516 } | |
| 1517 | |
| 1518 uint32_t fd_msg_eteid_get ( void ) | |
| 1519 { | |
| 1520 uint32_t ret; | |
| 1521 | |
| 1522 CHECK_POSIX_DO( pthread_mutex_lock(&fd_eteid_lck), /* continue */ ); | |
| 1523 | |
| 1524 ret = fd_eteid ++; | |
| 1525 | |
| 1526 CHECK_POSIX_DO( pthread_mutex_unlock(&fd_eteid_lck), /* continue */ ); | |
| 1527 | |
| 1528 return ret; | |
| 1529 } | |
| 1530 | |
| 1531 /***************************************************************************************************************/ | |
| 1532 /* Manage AVPs values */ | |
| 1533 | |
| 1534 /* Set the value of an AVP */ | |
| 1535 int fd_msg_avp_setvalue ( struct avp *avp, union avp_value *value ) | |
| 1536 { | |
| 1537 enum dict_avp_basetype type = -1; | |
| 1538 | |
| 1539 TRACE_ENTRY("%p %p", avp, value); | |
| 1540 | |
| 1541 /* Check parameter */ | |
| 1542 CHECK_PARAMS( CHECK_AVP(avp) && avp->avp_model ); | |
| 1543 | |
| 1544 /* Retrieve information from the AVP model */ | |
| 1545 { | |
| 1546 enum dict_object_type dicttype; | |
| 1547 struct dict_avp_data dictdata; | |
| 1548 | |
| 1549 CHECK_PARAMS( (fd_dict_gettype(avp->avp_model, &dicttype) == 0) && (dicttype == DICT_AVP) ); | |
| 1550 CHECK_FCT( fd_dict_getval(avp->avp_model, &dictdata) ); | |
| 1551 type = dictdata.avp_basetype; | |
| 1552 CHECK_PARAMS( type != AVP_TYPE_GROUPED ); | |
| 1553 } | |
| 1554 | |
| 1555 /* First, clean any previous value */ | |
| 1556 if (avp->avp_mustfreeos != 0) { | |
| 1557 free(avp->avp_storage.os.data); | |
| 1558 avp->avp_mustfreeos = 0; | |
| 1559 } | |
| 1560 | |
| 1561 memset(&avp->avp_storage, 0, sizeof(union avp_value)); | |
| 1562 | |
| 1563 /* If the request was to delete a value: */ | |
| 1564 if (!value) { | |
| 1565 avp->avp_public.avp_value = NULL; | |
| 1566 return 0; | |
| 1567 } | |
| 1568 | |
| 1569 /* Now we have to set the value */ | |
| 1570 memcpy(&avp->avp_storage, value, sizeof(union avp_value)); | |
| 1571 | |
| 730 | 1572 /* Duplicate an octetstring if needed. */ |
|
387
743195485eec
Additional fixes for empty octet string AVPs
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
386
diff
changeset
|
1573 if (type == AVP_TYPE_OCTETSTRING) { |
|
753
71833fa5e35f
allow applications to create empty AVP also
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
752
diff
changeset
|
1574 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
|
1575 avp->avp_mustfreeos = 1; |
| 0 | 1576 } |
| 1577 | |
| 1578 /* Set the data pointer of the public part */ | |
| 1579 avp->avp_public.avp_value = &avp->avp_storage; | |
| 1580 | |
| 1581 return 0; | |
| 1582 } | |
| 1583 | |
| 1584 /* Set the value of an AVP, using formatted data */ | |
| 1585 int fd_msg_avp_value_encode ( void *data, struct avp *avp ) | |
| 1586 { | |
| 1587 enum dict_avp_basetype type = -1; | |
| 1588 struct dict_type_data type_data; | |
| 1589 | |
| 1590 TRACE_ENTRY("%p %p", data, avp); | |
| 1591 | |
| 1592 /* Check parameter */ | |
| 1593 CHECK_PARAMS( CHECK_AVP(avp) && avp->avp_model ); | |
| 1594 | |
| 1595 /* Retrieve information from the AVP model and it's parent type */ | |
| 1596 { | |
| 1597 enum dict_object_type dicttype; | |
| 1598 struct dict_avp_data dictdata; | |
| 1599 struct dictionary * dict; | |
| 1600 struct dict_object * parenttype = NULL; | |
| 1601 | |
| 1602 /* First check the base type of the AVP */ | |
| 1603 CHECK_PARAMS( (fd_dict_gettype(avp->avp_model, &dicttype) == 0) && (dicttype == DICT_AVP) ); | |
| 1604 CHECK_FCT( fd_dict_getval(avp->avp_model, &dictdata) ); | |
| 1605 type = dictdata.avp_basetype; | |
| 1606 CHECK_PARAMS( type != AVP_TYPE_GROUPED ); | |
| 1607 | |
| 1608 /* Then retrieve information about the parent's type (= derived type) */ | |
| 1609 CHECK_FCT( fd_dict_getdict( avp->avp_model, &dict ) ); | |
| 1610 CHECK_FCT( fd_dict_search( dict, DICT_TYPE, TYPE_OF_AVP, avp->avp_model, &parenttype, EINVAL) ); | |
| 1611 CHECK_FCT( fd_dict_getval(parenttype, &type_data) ); | |
| 1612 if (type_data.type_encode == NULL) { | |
| 1613 TRACE_DEBUG(INFO, "This AVP type does not provide a callback to encode formatted data. ENOTSUP."); | |
| 1614 return ENOTSUP; | |
| 1615 } | |
| 1616 } | |
| 1617 | |
| 1618 /* Ok, now we can encode the value */ | |
| 1619 | |
| 1620 /* First, clean any previous value */ | |
| 1621 if (avp->avp_mustfreeos != 0) { | |
| 1622 free(avp->avp_storage.os.data); | |
| 1623 avp->avp_mustfreeos = 0; | |
| 1624 } | |
| 1625 avp->avp_public.avp_value = NULL; | |
| 1626 memset(&avp->avp_storage, 0, sizeof(union avp_value)); | |
| 1627 | |
| 1628 /* Now call the type's callback to encode the data */ | |
| 1629 CHECK_FCT( (*type_data.type_encode)(data, &avp->avp_storage) ); | |
| 1630 | |
| 1631 /* If an octetstring has been allocated, let's mark it to be freed */ | |
| 1632 if (type == AVP_TYPE_OCTETSTRING) | |
| 1633 avp->avp_mustfreeos = 1; | |
| 1634 | |
| 1635 /* Set the data pointer of the public part */ | |
| 1636 avp->avp_public.avp_value = &avp->avp_storage; | |
| 1637 | |
| 1638 return 0; | |
| 1639 } | |
| 1640 | |
| 1641 /* Interpret the value of an AVP into formatted data */ | |
| 1642 int fd_msg_avp_value_interpret ( struct avp *avp, void *data ) | |
| 1643 { | |
| 1644 struct dict_type_data type_data; | |
| 1645 | |
| 1646 TRACE_ENTRY("%p %p", avp, data); | |
| 1647 | |
| 1648 /* Check parameter */ | |
| 1649 CHECK_PARAMS( CHECK_AVP(avp) && avp->avp_model && avp->avp_public.avp_value ); | |
| 1650 | |
| 1651 /* Retrieve information about the AVP parent type */ | |
| 1652 { | |
| 1653 struct dictionary * dict; | |
| 1654 struct dict_object * parenttype = NULL; | |
| 1655 | |
| 1656 CHECK_FCT( fd_dict_getdict( avp->avp_model, &dict ) ); | |
| 1657 CHECK_FCT( fd_dict_search( dict, DICT_TYPE, TYPE_OF_AVP, avp->avp_model, &parenttype, EINVAL) ); | |
| 1658 CHECK_FCT( fd_dict_getval(parenttype, &type_data) ); | |
| 1659 if (type_data.type_interpret == NULL) { | |
| 1660 TRACE_DEBUG(INFO, "This AVP type does not provide a callback to interpret value in formatted data. ENOTSUP."); | |
| 1661 return ENOTSUP; | |
| 1662 } | |
| 1663 } | |
| 1664 | |
| 1665 /* Ok, now we can interpret the value */ | |
| 1666 | |
| 1667 CHECK_FCT( (*type_data.type_interpret)(avp->avp_public.avp_value, data) ); | |
| 1668 | |
| 1669 return 0; | |
| 1670 } | |
| 1671 | |
| 1672 /***************************************************************************************************************/ | |
| 1673 /* Creating a buffer from memory objects (bufferize a struct msg) */ | |
| 1674 | |
| 1675 /* Following macros are used to store 32 and 64 bit fields into a buffer in network byte order */ | |
| 1676 #define PUT_in_buf_32( _u32data, _bufptr ) { \ | |
| 1677 *(uint32_t *)(_bufptr) = htonl((uint32_t)(_u32data)); \ | |
| 1678 } | |
|
791
42fa209a8cc4
Attempt at fixing unaligned 64b direct memory access (sigbus on sparc)
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
765
diff
changeset
|
1679 |
|
42fa209a8cc4
Attempt at fixing unaligned 64b direct memory access (sigbus on sparc)
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
765
diff
changeset
|
1680 /* The location is not on 64b boundary, so we split the writing in two operations to avoid sigbus */ |
| 0 | 1681 #define PUT_in_buf_64( _u64data, _bufptr ) { \ |
|
791
42fa209a8cc4
Attempt at fixing unaligned 64b direct memory access (sigbus on sparc)
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
765
diff
changeset
|
1682 uint64_t __v = htonll((uint64_t)(_u64data)); \ |
|
792
0f566e550813
improved the previous fix... not sure it was correct
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
791
diff
changeset
|
1683 memcpy(_bufptr, &__v, sizeof(__v)); \ |
| 0 | 1684 } |
| 1685 | |
| 1686 /* Write a message header in the buffer */ | |
| 1687 static int bufferize_msg(unsigned char * buffer, size_t buflen, size_t * offset, struct msg * msg) | |
| 1688 { | |
|
1027
0117a7746b21
Fix a number of errors and warnings introduced/highlighted by recent commits
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1014
diff
changeset
|
1689 TRACE_ENTRY("%p %zd %p %p", buffer, buflen, offset, msg); |
| 0 | 1690 |
| 1691 if ((buflen - *offset) < GETMSGHDRSZ()) | |
| 1692 return ENOSPC; | |
| 1693 | |
| 1694 if (*offset & 0x3) | |
| 1695 return EFAULT; /* We are supposed to start on 32 bit boundaries */ | |
| 1696 | |
| 1697 PUT_in_buf_32(msg->msg_public.msg_length, buffer + *offset); | |
| 1698 buffer[*offset] = msg->msg_public.msg_version; | |
| 1699 *offset += 4; | |
| 1700 | |
| 1701 PUT_in_buf_32(msg->msg_public.msg_code, buffer + *offset); | |
| 1702 buffer[*offset] = msg->msg_public.msg_flags; | |
| 1703 *offset += 4; | |
| 1704 | |
| 1705 PUT_in_buf_32(msg->msg_public.msg_appl, buffer + *offset); | |
| 1706 *offset += 4; | |
| 1707 | |
| 1708 PUT_in_buf_32(msg->msg_public.msg_hbhid, buffer + *offset); | |
| 1709 *offset += 4; | |
| 1710 | |
| 1711 PUT_in_buf_32(msg->msg_public.msg_eteid, buffer + *offset); | |
| 1712 *offset += 4; | |
| 1713 | |
| 1714 return 0; | |
| 1715 } | |
| 1716 | |
| 1717 static int bufferize_chain(unsigned char * buffer, size_t buflen, size_t * offset, struct fd_list * list); | |
| 1718 | |
| 1719 /* Write an AVP in the buffer */ | |
| 1720 static int bufferize_avp(unsigned char * buffer, size_t buflen, size_t * offset, struct avp * avp) | |
| 1721 { | |
| 1722 struct dict_avp_data dictdata; | |
| 1723 | |
|
1027
0117a7746b21
Fix a number of errors and warnings introduced/highlighted by recent commits
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1014
diff
changeset
|
1724 TRACE_ENTRY("%p %zd %p %p", buffer, buflen, offset, avp); |
| 0 | 1725 |
| 1726 if ((buflen - *offset) < avp->avp_public.avp_len) | |
| 1727 return ENOSPC; | |
| 1728 | |
| 1729 /* Write the header */ | |
| 1730 PUT_in_buf_32(avp->avp_public.avp_code, buffer + *offset); | |
| 1731 *offset += 4; | |
| 1732 | |
| 1733 PUT_in_buf_32(avp->avp_public.avp_len, buffer + *offset); | |
| 1734 buffer[*offset] = avp->avp_public.avp_flags; | |
| 1735 *offset += 4; | |
| 1736 | |
| 1737 if (avp->avp_public.avp_flags & AVP_FLAG_VENDOR) { | |
| 1738 PUT_in_buf_32(avp->avp_public.avp_vendor, buffer + *offset); | |
| 1739 *offset += 4; | |
| 1740 } | |
| 1741 | |
| 1742 /* Then we must write the AVP value */ | |
| 1743 | |
| 1744 if (avp->avp_model == NULL) { | |
| 1745 /* In the case where we don't know the type of AVP, just copy the raw data or source */ | |
| 1746 CHECK_PARAMS( avp->avp_source || avp->avp_rawdata ); | |
| 1747 | |
|
1001
d03f7e3805ad
Fix generation of the Proxy-Info AVP in fd_msg_new_answer_from_req
Sebastien Decugis <sdecugis@freediameter.net>
parents:
995
diff
changeset
|
1748 if ( avp->avp_rawdata != NULL ) { |
|
d03f7e3805ad
Fix generation of the Proxy-Info AVP in fd_msg_new_answer_from_req
Sebastien Decugis <sdecugis@freediameter.net>
parents:
995
diff
changeset
|
1749 /* the content was stored in rawdata */ |
|
d03f7e3805ad
Fix generation of the Proxy-Info AVP in fd_msg_new_answer_from_req
Sebastien Decugis <sdecugis@freediameter.net>
parents:
995
diff
changeset
|
1750 memcpy(&buffer[*offset], avp->avp_rawdata, avp->avp_rawlen); |
|
d03f7e3805ad
Fix generation of the Proxy-Info AVP in fd_msg_new_answer_from_req
Sebastien Decugis <sdecugis@freediameter.net>
parents:
995
diff
changeset
|
1751 *offset += PAD4(avp->avp_rawlen); |
|
d03f7e3805ad
Fix generation of the Proxy-Info AVP in fd_msg_new_answer_from_req
Sebastien Decugis <sdecugis@freediameter.net>
parents:
995
diff
changeset
|
1752 } else { |
| 0 | 1753 /* the message was not parsed completely */ |
| 1754 size_t datalen = avp->avp_public.avp_len - GETAVPHDRSZ(avp->avp_public.avp_flags); | |
| 1755 memcpy(&buffer[*offset], avp->avp_source, datalen); | |
| 1756 *offset += PAD4(datalen); | |
| 1757 } | |
| 1758 | |
| 1759 } else { | |
| 1760 /* The AVP is defined in the dictionary */ | |
| 1761 CHECK_FCT( fd_dict_getval(avp->avp_model, &dictdata) ); | |
| 1762 | |
| 1763 CHECK_PARAMS( ( dictdata.avp_basetype == AVP_TYPE_GROUPED ) || avp->avp_public.avp_value ); | |
| 1764 | |
| 1765 switch (dictdata.avp_basetype) { | |
| 1766 case AVP_TYPE_GROUPED: | |
| 1767 return bufferize_chain(buffer, buflen, offset, &avp->avp_chain.children); | |
| 1768 | |
| 1769 case AVP_TYPE_OCTETSTRING: | |
|
387
743195485eec
Additional fixes for empty octet string AVPs
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
386
diff
changeset
|
1770 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
|
1771 memcpy(&buffer[*offset], avp->avp_public.avp_value->os.data, avp->avp_public.avp_value->os.len); |
| 0 | 1772 *offset += PAD4(avp->avp_public.avp_value->os.len); |
| 1773 break; | |
| 1774 | |
| 1775 case AVP_TYPE_INTEGER32: | |
| 1776 PUT_in_buf_32(avp->avp_public.avp_value->i32, buffer + *offset); | |
| 1777 *offset += 4; | |
| 1778 break; | |
| 1779 | |
| 1780 case AVP_TYPE_INTEGER64: | |
| 1781 PUT_in_buf_64(avp->avp_public.avp_value->i64, buffer + *offset); | |
| 1782 *offset += 8; | |
| 1783 break; | |
| 1784 | |
| 1785 case AVP_TYPE_UNSIGNED32: | |
| 1786 PUT_in_buf_32(avp->avp_public.avp_value->u32, buffer + *offset); | |
| 1787 *offset += 4; | |
| 1788 break; | |
| 1789 | |
| 1790 case AVP_TYPE_UNSIGNED64: | |
| 1791 PUT_in_buf_64(avp->avp_public.avp_value->u64, buffer + *offset); | |
| 1792 *offset += 8; | |
| 1793 break; | |
| 1794 | |
| 1795 case AVP_TYPE_FLOAT32: | |
| 1796 /* We read the f32 as "u32" here to avoid casting to uint make decimals go away. | |
| 1797 The alternative would be something like "*(uint32_t *)(& f32)" but | |
| 1798 then the compiler complains about strict-aliasing rules. */ | |
| 1799 PUT_in_buf_32(avp->avp_public.avp_value->u32, buffer + *offset); | |
| 1800 *offset += 4; | |
| 1801 break; | |
| 1802 | |
| 1803 case AVP_TYPE_FLOAT64: | |
| 1804 /* Same remark as previously */ | |
| 1805 PUT_in_buf_64(avp->avp_public.avp_value->u64, buffer + *offset); | |
| 1806 *offset += 8; | |
| 1807 break; | |
| 1808 | |
| 1809 default: | |
| 1810 ASSERT(0); | |
| 1811 } | |
| 1812 } | |
| 1813 return 0; | |
| 1814 } | |
| 1815 | |
| 1816 /* Write a chain of AVPs in the buffer */ | |
| 1817 static int bufferize_chain(unsigned char * buffer, size_t buflen, size_t * offset, struct fd_list * list) | |
| 1818 { | |
| 1819 struct fd_list * avpch; | |
| 1820 | |
|
1027
0117a7746b21
Fix a number of errors and warnings introduced/highlighted by recent commits
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1014
diff
changeset
|
1821 TRACE_ENTRY("%p %zd %p %p", buffer, buflen, offset, list); |
| 0 | 1822 |
| 1823 for (avpch = list->next; avpch != list; avpch = avpch->next) { | |
| 1824 /* Bufferize the AVP */ | |
| 1825 CHECK_FCT( bufferize_avp(buffer, buflen, offset, _A(avpch->o)) ); | |
| 1826 } | |
| 1827 return 0; | |
| 1828 } | |
| 1829 | |
| 1830 /* Create the message buffer, in network-byte order. We browse the tree twice, this could be probably improved if needed */ | |
| 1831 int fd_msg_bufferize ( struct msg * msg, unsigned char ** buffer, size_t * len ) | |
| 1832 { | |
| 1833 int ret = 0; | |
| 1834 unsigned char * buf = NULL; | |
| 1835 size_t offset = 0; | |
| 1836 | |
| 1837 TRACE_ENTRY("%p %p %p", msg, buffer, len); | |
| 1838 | |
| 1839 /* Check the parameters */ | |
| 1840 CHECK_PARAMS( buffer && CHECK_MSG(msg) ); | |
| 1841 | |
| 1842 /* Update the length. This also checks that all AVP have their values set */ | |
| 1843 CHECK_FCT( fd_msg_update_length(msg) ); | |
| 1844 | |
| 1845 /* Now allocate a buffer to store the message */ | |
| 1846 CHECK_MALLOC( buf = malloc(msg->msg_public.msg_length) ); | |
| 1847 | |
| 1848 /* Clear the memory, so that the padding is always 0 (should not matter) */ | |
| 1849 memset(buf, 0, msg->msg_public.msg_length); | |
| 1850 | |
| 1851 /* Write the message header in the buffer */ | |
| 1852 CHECK_FCT_DO( ret = bufferize_msg(buf, msg->msg_public.msg_length, &offset, msg), | |
| 1853 { | |
| 1854 free(buf); | |
| 1855 return ret; | |
| 1856 } ); | |
| 1857 | |
| 1858 /* Write the list of AVPs */ | |
| 1859 CHECK_FCT_DO( ret = bufferize_chain(buf, msg->msg_public.msg_length, &offset, &msg->msg_chain.children), | |
| 1860 { | |
| 1861 free(buf); | |
| 1862 return ret; | |
| 1863 } ); | |
| 1864 | |
| 1865 ASSERT(offset == msg->msg_public.msg_length); /* or the msg_update_length is buggy */ | |
| 1866 | |
| 1867 if (len) { | |
| 1868 *len = offset; | |
| 1869 } | |
| 1870 | |
| 1871 *buffer = buf; | |
| 1872 return 0; | |
| 1873 } | |
| 1874 | |
| 1875 | |
| 1876 /***************************************************************************************************************/ | |
| 1877 /* Parsing buffers and building AVP objects lists (not parsing the AVP values which requires dictionary knowledge) */ | |
| 1878 | |
| 1879 /* Parse a buffer containing a supposed list of AVPs */ | |
| 1880 static int parsebuf_list(unsigned char * buf, size_t buflen, struct fd_list * head) | |
| 1881 { | |
| 1882 size_t offset = 0; | |
| 1883 | |
|
1027
0117a7746b21
Fix a number of errors and warnings introduced/highlighted by recent commits
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1014
diff
changeset
|
1884 TRACE_ENTRY("%p %zd %p", buf, buflen, head); |
| 0 | 1885 |
| 1886 while (offset < buflen) { | |
| 1887 struct avp * avp; | |
| 1888 | |
|
920
cb439d57d0c5
Fix parsing of incoming AVPs with 0-byte length at the end of the message
Sebastien Decugis <sdecugis@freediameter.net>
parents:
919
diff
changeset
|
1889 if (buflen - offset < AVPHDRSZ_NOVEND) { |
|
1027
0117a7746b21
Fix a number of errors and warnings introduced/highlighted by recent commits
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1014
diff
changeset
|
1890 TRACE_DEBUG(INFO, "truncated buffer: remaining only %zd bytes", buflen - offset); |
| 0 | 1891 return EBADMSG; |
| 1892 } | |
| 1893 | |
| 1894 /* Create a new AVP object */ | |
| 1895 CHECK_MALLOC( avp = malloc (sizeof(struct avp)) ); | |
| 1896 | |
| 1897 init_avp(avp); | |
| 1898 | |
| 1899 /* Initialize the header */ | |
| 1900 avp->avp_public.avp_code = ntohl(*(uint32_t *)(buf + offset)); | |
| 1901 avp->avp_public.avp_flags = buf[offset + 4]; | |
| 1902 avp->avp_public.avp_len = ((uint32_t)buf[offset+5]) << 16 | ((uint32_t)buf[offset+6]) << 8 | ((uint32_t)buf[offset+7]) ; | |
| 1903 | |
| 1904 offset += 8; | |
| 1905 | |
| 1906 if (avp->avp_public.avp_flags & AVP_FLAG_VENDOR) { | |
|
920
cb439d57d0c5
Fix parsing of incoming AVPs with 0-byte length at the end of the message
Sebastien Decugis <sdecugis@freediameter.net>
parents:
919
diff
changeset
|
1907 if (buflen - offset < 4) { |
|
1027
0117a7746b21
Fix a number of errors and warnings introduced/highlighted by recent commits
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1014
diff
changeset
|
1908 TRACE_DEBUG(INFO, "truncated buffer: remaining only %zd bytes for vendor and data", buflen - offset); |
| 0 | 1909 free(avp); |
| 1910 return EBADMSG; | |
| 1911 } | |
| 1912 avp->avp_public.avp_vendor = ntohl(*(uint32_t *)(buf + offset)); | |
| 1913 offset += 4; | |
| 1914 } | |
| 1915 | |
| 1916 /* Check there is enough remaining data in the buffer */ | |
|
920
cb439d57d0c5
Fix parsing of incoming AVPs with 0-byte length at the end of the message
Sebastien Decugis <sdecugis@freediameter.net>
parents:
919
diff
changeset
|
1917 if ( (avp->avp_public.avp_len > GETAVPHDRSZ(avp->avp_public.avp_flags)) |
|
cb439d57d0c5
Fix parsing of incoming AVPs with 0-byte length at the end of the message
Sebastien Decugis <sdecugis@freediameter.net>
parents:
919
diff
changeset
|
1918 && (buflen - offset < avp->avp_public.avp_len - GETAVPHDRSZ(avp->avp_public.avp_flags))) { |
|
1027
0117a7746b21
Fix a number of errors and warnings introduced/highlighted by recent commits
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1014
diff
changeset
|
1919 TRACE_DEBUG(INFO, "truncated buffer: remaining only %zd bytes for data, and avp data size is %d", |
| 0 | 1920 buflen - offset, |
| 1921 avp->avp_public.avp_len - GETAVPHDRSZ(avp->avp_public.avp_flags)); | |
| 1922 free(avp); | |
| 1923 return EBADMSG; | |
| 1924 } | |
| 1925 | |
| 1926 /* buf[offset] is now the beginning of the data */ | |
| 1927 avp->avp_source = &buf[offset]; | |
| 1928 | |
| 1929 /* Now eat the data and eventual padding */ | |
| 1930 offset += PAD4(avp->avp_public.avp_len - GETAVPHDRSZ(avp->avp_public.avp_flags)); | |
| 1931 | |
| 1932 /* And insert this avp in the list, at the end */ | |
| 1933 fd_list_insert_before( head, &avp->avp_chain.chaining ); | |
| 1934 } | |
| 1935 | |
| 1936 return 0; | |
| 1937 } | |
| 1938 | |
| 1939 /* Create a message object from a buffer. Dictionary objects are not resolved, AVP contents are not interpreted, buffer is saved in msg */ | |
| 1940 int fd_msg_parse_buffer ( unsigned char ** buffer, size_t buflen, struct msg ** msg ) | |
| 1941 { | |
| 1942 struct msg * new = NULL; | |
| 1943 int ret = 0; | |
| 1944 uint32_t msglen = 0; | |
| 1945 unsigned char * buf; | |
| 1946 | |
|
1027
0117a7746b21
Fix a number of errors and warnings introduced/highlighted by recent commits
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1014
diff
changeset
|
1947 TRACE_ENTRY("%p %zd %p", buffer, buflen, msg); |
| 0 | 1948 |
| 1949 CHECK_PARAMS( buffer && *buffer && msg && (buflen >= GETMSGHDRSZ()) ); | |
| 1950 buf = *buffer; | |
| 1951 | |
| 1952 if ( buf[0] != DIAMETER_VERSION) { | |
| 1953 TRACE_DEBUG(INFO, "Invalid version in message: %d (supported: %d)", buf[0], DIAMETER_VERSION); | |
| 1954 return EBADMSG; | |
| 1955 } | |
| 1956 | |
| 1957 msglen = ntohl(*(uint32_t *)buf) & 0x00ffffff; | |
| 1958 if ( buflen < msglen ) { | |
|
1027
0117a7746b21
Fix a number of errors and warnings introduced/highlighted by recent commits
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1014
diff
changeset
|
1959 TRACE_DEBUG(INFO, "Truncated message (%zd / %d)", buflen, msglen ); |
| 0 | 1960 return EBADMSG; |
| 1961 } | |
| 1962 | |
| 1963 /* Create a new object */ | |
|
1103
d8591b1c56cd
Implemented a few hooks
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1101
diff
changeset
|
1964 CHECK_MALLOC( new = malloc (sizeof(struct msg)) ); |
| 0 | 1965 |
| 1966 /* Initialize the fields */ | |
| 1967 init_msg(new); | |
| 1968 | |
| 1969 /* Now read from the buffer */ | |
| 1970 new->msg_public.msg_version = buf[0]; | |
| 1971 new->msg_public.msg_length = msglen; | |
| 1972 | |
| 1973 new->msg_public.msg_flags = buf[4]; | |
| 1974 new->msg_public.msg_code = ntohl(*(uint32_t *)(buf+4)) & 0x00ffffff; | |
| 1975 | |
| 1976 new->msg_public.msg_appl = ntohl(*(uint32_t *)(buf+8)); | |
| 1977 new->msg_public.msg_hbhid = ntohl(*(uint32_t *)(buf+12)); | |
| 1978 new->msg_public.msg_eteid = ntohl(*(uint32_t *)(buf+16)); | |
| 1979 | |
| 1980 /* Parse the AVP list */ | |
| 1981 CHECK_FCT_DO( ret = parsebuf_list(buf + GETMSGHDRSZ(), buflen - GETMSGHDRSZ(), &new->msg_chain.children), { destroy_tree(_C(new)); return ret; } ); | |
| 1982 | |
|
1103
d8591b1c56cd
Implemented a few hooks
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1101
diff
changeset
|
1983 /* Parsing successful */ |
|
d8591b1c56cd
Implemented a few hooks
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1101
diff
changeset
|
1984 new->msg_rawbuffer = buf; |
|
d8591b1c56cd
Implemented a few hooks
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1101
diff
changeset
|
1985 *buffer = NULL; |
| 0 | 1986 *msg = new; |
| 1987 return 0; | |
| 1988 } | |
| 1989 | |
| 1990 | |
| 1991 /***************************************************************************************************************/ | |
| 1992 /* Parsing messages and AVP with dictionary information */ | |
| 1993 | |
| 1994 /* Resolve dictionary objects of the cmd and avp instances, from their headers. | |
| 1995 * When the model is found, the data is interpreted from the avp_source buffer and copied to avp_storage. | |
| 1996 * When the model is not found, the data is copied as rawdata and saved (in case we FW the message). | |
| 1997 * Therefore, after this function has been called, the source buffer can be freed. | |
| 1998 * For command, if the dictionary model is not found, an error is returned. | |
| 1999 */ | |
| 2000 | |
|
889
4a299daed8b2
Add information about parsing errors
Sebastien Decugis <sdecugis@freediameter.net>
parents:
871
diff
changeset
|
2001 static char error_message[256]; |
|
4a299daed8b2
Add information about parsing errors
Sebastien Decugis <sdecugis@freediameter.net>
parents:
871
diff
changeset
|
2002 |
| 0 | 2003 /* 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
|
2004 static int parsedict_do_avp(struct dictionary * dict, struct avp * avp, int mandatory, struct fd_pei *error_info) |
| 0 | 2005 { |
| 2006 struct dict_avp_data dictdata; | |
|
1001
d03f7e3805ad
Fix generation of the Proxy-Info AVP in fd_msg_new_answer_from_req
Sebastien Decugis <sdecugis@freediameter.net>
parents:
995
diff
changeset
|
2007 uint8_t * source; |
| 0 | 2008 |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2009 TRACE_ENTRY("%p %p %d %p", dict, avp, mandatory, error_info); |
| 0 | 2010 |
| 2011 /* First check we received an AVP as input */ | |
| 2012 CHECK_PARAMS( CHECK_AVP(avp) ); | |
| 2013 | |
| 2014 if (avp->avp_model != NULL) { | |
| 2015 /* the model has already been resolved. we do check it is still valid */ | |
| 2016 | |
| 2017 CHECK_FCT( fd_dict_getval(avp->avp_model, &dictdata) ); | |
| 2018 | |
| 2019 if ( avp->avp_public.avp_code == dictdata.avp_code ) { | |
| 2020 /* 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
|
2021 return parsedict_do_chain(dict, &avp->avp_chain.children, mandatory && (avp->avp_public.avp_flags & AVP_FLAG_MANDATORY), error_info); |
| 0 | 2022 } else { |
| 2023 /* We just erase the old model */ | |
| 2024 avp->avp_model = NULL; | |
| 2025 } | |
| 2026 } | |
| 2027 | |
|
1092
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2028 /* Check if we already searched for this model without success */ |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2029 if ((avp->avp_model_not_found.mnf_code != avp->avp_public.avp_code) |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2030 || (avp->avp_model_not_found.mnf_vendor != avp->avp_public.avp_vendor)) { |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2031 |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2032 /* Now try and resolve the model from the avp code and vendor */ |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2033 if (avp->avp_public.avp_flags & AVP_FLAG_VENDOR) { |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2034 struct dict_avp_request_ex avpreq; |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2035 memset(&avpreq, 0, sizeof(avpreq)); |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2036 avpreq.avp_vendor.vendor_id = avp->avp_public.avp_vendor; |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2037 avpreq.avp_data.avp_code = avp->avp_public.avp_code; |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2038 CHECK_FCT( fd_dict_search ( dict, DICT_AVP, AVP_BY_STRUCT, &avpreq, &avp->avp_model, 0)); |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2039 } else { |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2040 /* no vendor */ |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2041 CHECK_FCT( fd_dict_search ( dict, DICT_AVP, AVP_BY_CODE, &avp->avp_public.avp_code, &avp->avp_model, 0)); |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2042 } |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2043 |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2044 if (!avp->avp_model) { |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2045 avp->avp_model_not_found.mnf_code = avp->avp_public.avp_code; |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2046 avp->avp_model_not_found.mnf_vendor = avp->avp_public.avp_vendor; |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2047 } |
| 0 | 2048 } |
| 2049 | |
| 2050 /* First handle the case where we have not found this AVP in the dictionary */ | |
| 2051 if (!avp->avp_model) { | |
| 2052 | |
| 2053 if (mandatory && (avp->avp_public.avp_flags & AVP_FLAG_MANDATORY)) { | |
|
1119
79dd22145f52
Fix a number of compilation warnings
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1113
diff
changeset
|
2054 TRACE_DEBUG(INFO, "Unsupported mandatory AVP found"); |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2055 if (error_info) { |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2056 error_info->pei_errcode = "DIAMETER_AVP_UNSUPPORTED"; |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2057 error_info->pei_avp = avp; |
|
1119
79dd22145f52
Fix a number of compilation warnings
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1113
diff
changeset
|
2058 } else { |
|
79dd22145f52
Fix a number of compilation warnings
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1113
diff
changeset
|
2059 char * buf = NULL; |
|
79dd22145f52
Fix a number of compilation warnings
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1113
diff
changeset
|
2060 size_t buflen; |
|
79dd22145f52
Fix a number of compilation warnings
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1113
diff
changeset
|
2061 CHECK_MALLOC(fd_msg_dump_treeview(&buf, &buflen, NULL, avp, NULL, 0, 0)); |
|
79dd22145f52
Fix a number of compilation warnings
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1113
diff
changeset
|
2062 LOG_E("Unsupported AVP: %s", buf); |
|
79dd22145f52
Fix a number of compilation warnings
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1113
diff
changeset
|
2063 free(buf); |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2064 } |
| 0 | 2065 return ENOTSUP; |
| 2066 } | |
| 2067 | |
| 2068 if (avp->avp_source) { | |
| 2069 /* we must copy the data from the source to the internal buffer area */ | |
| 2070 CHECK_PARAMS( !avp->avp_rawdata ); | |
| 2071 | |
| 2072 avp->avp_rawlen = avp->avp_public.avp_len - GETAVPHDRSZ( avp->avp_public.avp_flags ); | |
| 2073 | |
|
387
743195485eec
Additional fixes for empty octet string AVPs
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
386
diff
changeset
|
2074 if (avp->avp_rawlen) { |
|
743195485eec
Additional fixes for empty octet string AVPs
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
386
diff
changeset
|
2075 CHECK_MALLOC( avp->avp_rawdata = malloc(avp->avp_rawlen) ); |
| 0 | 2076 |
|
387
743195485eec
Additional fixes for empty octet string AVPs
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
386
diff
changeset
|
2077 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
|
2078 } |
|
743195485eec
Additional fixes for empty octet string AVPs
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
386
diff
changeset
|
2079 |
| 0 | 2080 avp->avp_source = NULL; |
| 2081 | |
| 2082 TRACE_DEBUG(FULL, "Unsupported optional AVP found, raw source data saved in avp_rawdata."); | |
| 2083 } | |
| 2084 | |
| 2085 return 0; | |
| 2086 } | |
| 2087 | |
| 2088 /* Ok we have resolved the object. Now we need to interpret its content. */ | |
| 2089 | |
| 2090 CHECK_FCT( fd_dict_getval(avp->avp_model, &dictdata) ); | |
| 2091 | |
| 2092 if (avp->avp_rawdata) { | |
| 2093 /* This happens if the dictionary object was defined after the first check */ | |
| 2094 avp->avp_source = avp->avp_rawdata; | |
| 2095 } | |
| 2096 | |
| 2097 /* A bit of sanity here... */ | |
| 2098 ASSERT(CHECK_BASETYPE(dictdata.avp_basetype)); | |
| 2099 | |
| 2100 /* Check the size is valid */ | |
| 2101 if ((avp_value_sizes[dictdata.avp_basetype] != 0) && | |
| 2102 (avp->avp_public.avp_len - GETAVPHDRSZ( avp->avp_public.avp_flags ) != avp_value_sizes[dictdata.avp_basetype])) { | |
|
1119
79dd22145f52
Fix a number of compilation warnings
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1113
diff
changeset
|
2103 TRACE_DEBUG(INFO, "The AVP size is not suitable for the type"); |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2104 if (error_info) { |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2105 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
|
2106 error_info->pei_avp = avp; |
|
889
4a299daed8b2
Add information about parsing errors
Sebastien Decugis <sdecugis@freediameter.net>
parents:
871
diff
changeset
|
2107 snprintf(error_message, sizeof(error_message), "I expected a size of %d for this AVP according to my dictionary", avp_value_sizes[dictdata.avp_basetype]); |
|
4a299daed8b2
Add information about parsing errors
Sebastien Decugis <sdecugis@freediameter.net>
parents:
871
diff
changeset
|
2108 error_info->pei_message = error_message; |
|
1119
79dd22145f52
Fix a number of compilation warnings
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1113
diff
changeset
|
2109 } else { |
|
79dd22145f52
Fix a number of compilation warnings
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1113
diff
changeset
|
2110 char * buf = NULL; |
|
79dd22145f52
Fix a number of compilation warnings
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1113
diff
changeset
|
2111 size_t buflen; |
|
79dd22145f52
Fix a number of compilation warnings
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1113
diff
changeset
|
2112 CHECK_MALLOC(fd_msg_dump_treeview(&buf, &buflen, NULL, avp, NULL, 0, 0)); |
|
79dd22145f52
Fix a number of compilation warnings
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1113
diff
changeset
|
2113 LOG_E("Invalid length AVP: %s", buf); |
|
79dd22145f52
Fix a number of compilation warnings
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1113
diff
changeset
|
2114 free(buf); |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2115 } |
|
891
9432ac55823c
Tentative fix for the parse_or_error function
Sebastien Decugis <sdecugis@freediameter.net>
parents:
889
diff
changeset
|
2116 avp->avp_model = NULL; |
| 0 | 2117 return EBADMSG; |
| 2118 } | |
| 2119 | |
|
1001
d03f7e3805ad
Fix generation of the Proxy-Info AVP in fd_msg_new_answer_from_req
Sebastien Decugis <sdecugis@freediameter.net>
parents:
995
diff
changeset
|
2120 source = avp->avp_source; |
|
d03f7e3805ad
Fix generation of the Proxy-Info AVP in fd_msg_new_answer_from_req
Sebastien Decugis <sdecugis@freediameter.net>
parents:
995
diff
changeset
|
2121 avp->avp_source = NULL; |
|
d03f7e3805ad
Fix generation of the Proxy-Info AVP in fd_msg_new_answer_from_req
Sebastien Decugis <sdecugis@freediameter.net>
parents:
995
diff
changeset
|
2122 |
| 0 | 2123 /* Now get the value inside */ |
| 2124 switch (dictdata.avp_basetype) { | |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2125 case AVP_TYPE_GROUPED: { |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2126 int ret; |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2127 |
| 0 | 2128 /* This is a grouped AVP, so let's parse the list of AVPs inside */ |
|
1001
d03f7e3805ad
Fix generation of the Proxy-Info AVP in fd_msg_new_answer_from_req
Sebastien Decugis <sdecugis@freediameter.net>
parents:
995
diff
changeset
|
2129 CHECK_FCT_DO( ret = parsebuf_list(source, avp->avp_public.avp_len - GETAVPHDRSZ( avp->avp_public.avp_flags ), &avp->avp_chain.children), |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2130 { |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2131 if ((ret == EBADMSG) && (error_info)) { |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2132 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
|
2133 error_info->pei_avp = avp; |
|
889
4a299daed8b2
Add information about parsing errors
Sebastien Decugis <sdecugis@freediameter.net>
parents:
871
diff
changeset
|
2134 snprintf(error_message, sizeof(error_message), "I cannot parse this AVP as a Grouped AVP"); |
|
4a299daed8b2
Add information about parsing errors
Sebastien Decugis <sdecugis@freediameter.net>
parents:
871
diff
changeset
|
2135 error_info->pei_message = error_message; |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2136 } |
|
1001
d03f7e3805ad
Fix generation of the Proxy-Info AVP in fd_msg_new_answer_from_req
Sebastien Decugis <sdecugis@freediameter.net>
parents:
995
diff
changeset
|
2137 avp->avp_source = source; |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2138 return ret; |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2139 } ); |
| 0 | 2140 |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2141 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
|
2142 } |
| 0 | 2143 |
| 2144 case AVP_TYPE_OCTETSTRING: | |
| 2145 /* 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
|
2146 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
|
2147 { |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2148 if (error_info) { |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2149 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
|
2150 error_info->pei_avp = avp; |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2151 } |
|
1001
d03f7e3805ad
Fix generation of the Proxy-Info AVP in fd_msg_new_answer_from_req
Sebastien Decugis <sdecugis@freediameter.net>
parents:
995
diff
changeset
|
2152 avp->avp_source = source; |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2153 return EBADMSG; |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2154 } ); |
| 0 | 2155 avp->avp_storage.os.len = avp->avp_public.avp_len - GETAVPHDRSZ( avp->avp_public.avp_flags ); |
|
1001
d03f7e3805ad
Fix generation of the Proxy-Info AVP in fd_msg_new_answer_from_req
Sebastien Decugis <sdecugis@freediameter.net>
parents:
995
diff
changeset
|
2156 CHECK_MALLOC( avp->avp_storage.os.data = os0dup(source, avp->avp_storage.os.len) ); |
|
752
9e9840ccf059
Attempt to handle more gracefully (invalid) AVPs that contain an empty octetstring
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
740
diff
changeset
|
2157 avp->avp_mustfreeos = 1; |
| 0 | 2158 break; |
| 2159 | |
| 2160 case AVP_TYPE_INTEGER32: | |
|
1001
d03f7e3805ad
Fix generation of the Proxy-Info AVP in fd_msg_new_answer_from_req
Sebastien Decugis <sdecugis@freediameter.net>
parents:
995
diff
changeset
|
2161 avp->avp_storage.i32 = (int32_t)ntohl(*(uint32_t *)source); |
| 0 | 2162 break; |
| 2163 | |
| 2164 case AVP_TYPE_INTEGER64: | |
|
791
42fa209a8cc4
Attempt at fixing unaligned 64b direct memory access (sigbus on sparc)
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
765
diff
changeset
|
2165 /* the storage might not be aligned on 64b boundary, so no direct indirection here is possible */ |
|
42fa209a8cc4
Attempt at fixing unaligned 64b direct memory access (sigbus on sparc)
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
765
diff
changeset
|
2166 { |
|
42fa209a8cc4
Attempt at fixing unaligned 64b direct memory access (sigbus on sparc)
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
765
diff
changeset
|
2167 uint64_t __stor; |
|
1001
d03f7e3805ad
Fix generation of the Proxy-Info AVP in fd_msg_new_answer_from_req
Sebastien Decugis <sdecugis@freediameter.net>
parents:
995
diff
changeset
|
2168 memcpy(&__stor, source, sizeof(__stor)); |
|
791
42fa209a8cc4
Attempt at fixing unaligned 64b direct memory access (sigbus on sparc)
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
765
diff
changeset
|
2169 avp->avp_storage.i64 = (int64_t)ntohll(__stor); |
|
42fa209a8cc4
Attempt at fixing unaligned 64b direct memory access (sigbus on sparc)
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
765
diff
changeset
|
2170 } |
| 0 | 2171 break; |
| 2172 | |
| 2173 case AVP_TYPE_UNSIGNED32: | |
| 2174 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 */ | |
|
1001
d03f7e3805ad
Fix generation of the Proxy-Info AVP in fd_msg_new_answer_from_req
Sebastien Decugis <sdecugis@freediameter.net>
parents:
995
diff
changeset
|
2175 avp->avp_storage.u32 = (uint32_t)ntohl(*(uint32_t *)source); |
| 0 | 2176 break; |
| 2177 | |
| 2178 case AVP_TYPE_UNSIGNED64: | |
| 2179 case AVP_TYPE_FLOAT64: /* same as 32 bits */ | |
|
791
42fa209a8cc4
Attempt at fixing unaligned 64b direct memory access (sigbus on sparc)
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
765
diff
changeset
|
2180 { |
|
42fa209a8cc4
Attempt at fixing unaligned 64b direct memory access (sigbus on sparc)
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
765
diff
changeset
|
2181 uint64_t __stor; |
|
1001
d03f7e3805ad
Fix generation of the Proxy-Info AVP in fd_msg_new_answer_from_req
Sebastien Decugis <sdecugis@freediameter.net>
parents:
995
diff
changeset
|
2182 memcpy(&__stor, source, sizeof(__stor)); |
|
791
42fa209a8cc4
Attempt at fixing unaligned 64b direct memory access (sigbus on sparc)
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
765
diff
changeset
|
2183 avp->avp_storage.u64 = (uint64_t)ntohll(__stor); |
|
42fa209a8cc4
Attempt at fixing unaligned 64b direct memory access (sigbus on sparc)
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
765
diff
changeset
|
2184 } |
| 0 | 2185 break; |
| 2186 | |
| 2187 } | |
| 2188 | |
| 2189 /* The value is now set, so set the data pointer and return 0 */ | |
| 2190 avp->avp_public.avp_value = &avp->avp_storage; | |
| 2191 return 0; | |
| 2192 } | |
| 2193 | |
| 2194 /* Process a list of AVPs */ | |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2195 static int parsedict_do_chain(struct dictionary * dict, struct fd_list * head, int mandatory, struct fd_pei *error_info) |
| 0 | 2196 { |
| 2197 struct fd_list * avpch; | |
| 2198 | |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2199 TRACE_ENTRY("%p %p %d %p", dict, head, mandatory, error_info); |
| 0 | 2200 |
| 2201 /* Sanity check */ | |
| 2202 ASSERT ( head == head->head ); | |
| 2203 | |
| 2204 /* Now process the list */ | |
| 2205 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
|
2206 CHECK_FCT( parsedict_do_avp(dict, _A(avpch->o), mandatory, error_info) ); |
| 0 | 2207 } |
| 2208 | |
| 2209 /* Done */ | |
| 2210 return 0; | |
| 2211 } | |
| 2212 | |
| 2213 /* Process a msg header. */ | |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2214 static int parsedict_do_msg(struct dictionary * dict, struct msg * msg, int only_hdr, struct fd_pei *error_info) |
| 0 | 2215 { |
| 2216 int ret = 0; | |
| 2217 | |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2218 TRACE_ENTRY("%p %p %d %p", dict, msg, only_hdr, error_info); |
| 0 | 2219 |
| 2220 CHECK_PARAMS( CHECK_MSG(msg) ); | |
| 2221 | |
|
1092
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2222 /* First, check if we already have a model. */ |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2223 if (msg->msg_model != NULL) { |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2224 /* Check if this model is still valid for the message data */ |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2225 enum dict_object_type dicttype; |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2226 struct dict_cmd_data data; |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2227 ASSERT(((fd_dict_gettype(msg->msg_model, &dicttype) == 0) && (dicttype == DICT_COMMAND))); |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2228 (void)fd_dict_getval( msg->msg_model, &data); |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2229 if ((data.cmd_code != msg->msg_public.msg_code) |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2230 || ((data.cmd_flag_val & data.cmd_flag_mask) != (msg->msg_public.msg_flags && data.cmd_flag_mask))) { |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2231 msg->msg_model = NULL; |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2232 } else { |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2233 goto chain; |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2234 } |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2235 } |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2236 |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2237 /* Check if we already searched for this model without success */ |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2238 if ((msg->msg_model_not_found.mnf_code == msg->msg_public.msg_code) |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2239 && (msg->msg_model_not_found.mnf_flags == msg->msg_public.msg_flags)) { |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2240 goto no_model; |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2241 } else { |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2242 msg->msg_model_not_found.mnf_code = 0; |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2243 } |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2244 |
| 0 | 2245 /* 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
|
2246 CHECK_FCT_DO( ret = fd_dict_search ( dict, DICT_COMMAND, |
| 0 | 2247 (msg->msg_public.msg_flags & CMD_FLAG_REQUEST) ? CMD_BY_CODE_R : CMD_BY_CODE_A, |
| 2248 &msg->msg_public.msg_code, | |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2249 &msg->msg_model, ENOTSUP), |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2250 { |
|
1092
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2251 if (ret == ENOTSUP) { |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2252 /* update the model not found info */ |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2253 msg->msg_model_not_found.mnf_code = msg->msg_public.msg_code; |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2254 msg->msg_model_not_found.mnf_flags = msg->msg_public.msg_flags; |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2255 goto no_model; |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2256 } |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2257 return ret; |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2258 } ); |
|
1092
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2259 chain: |
| 0 | 2260 if (!only_hdr) { |
| 2261 /* Then process the children */ | |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2262 ret = parsedict_do_chain(dict, &msg->msg_chain.children, 1, error_info); |
| 0 | 2263 |
| 2264 /* Free the raw buffer if any */ | |
| 2265 if ((ret == 0) && (msg->msg_rawbuffer != NULL)) { | |
| 2266 free(msg->msg_rawbuffer); | |
| 2267 msg->msg_rawbuffer=NULL; | |
| 2268 } | |
| 2269 } | |
| 2270 | |
| 2271 return ret; | |
|
1092
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2272 no_model: |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2273 if (error_info) { |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2274 error_info->pei_errcode = "DIAMETER_COMMAND_UNSUPPORTED"; |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2275 error_info->pei_protoerr = 1; |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2276 } |
|
e40374ddfeef
Optimization: do not attempt resolving dictionary objects again when it already failed during message parsing
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1085
diff
changeset
|
2277 return ENOTSUP; |
| 0 | 2278 } |
| 2279 | |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2280 int fd_msg_parse_dict ( msg_or_avp * object, struct dictionary * dict, struct fd_pei *error_info ) |
| 0 | 2281 { |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2282 TRACE_ENTRY("%p %p %p", dict, object, error_info); |
| 0 | 2283 |
| 2284 CHECK_PARAMS( VALIDATE_OBJ(object) ); | |
| 2285 | |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2286 if (error_info) |
|
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2287 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
|
2288 |
| 0 | 2289 switch (_C(object)->type) { |
| 2290 case MSG_MSG: | |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2291 return parsedict_do_msg(dict, _M(object), 0, error_info); |
| 0 | 2292 |
| 2293 case MSG_AVP: | |
|
114
5b3868944e2b
Reporting errors in parse_dict function
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
112
diff
changeset
|
2294 return parsedict_do_avp(dict, _A(object), 0, error_info); |
| 0 | 2295 |
| 2296 default: | |
| 2297 ASSERT(0); | |
| 2298 } | |
| 2299 return EINVAL; | |
| 2300 } | |
| 2301 | |
| 2302 /***************************************************************************************************************/ | |
| 2303 /* Parsing messages and AVP for rules (ABNF) compliance */ | |
| 2304 | |
| 2305 /* This function is used to get stats (first occurence position, last occurence position, number of occurences) | |
| 2306 of AVP instances of a given model in a chain of AVP */ | |
| 2307 static void parserules_stat_avps( struct dict_object * model_avp, struct fd_list *list, int * count, int * firstpos, int * lastpos) | |
| 2308 { | |
| 2309 struct fd_list * li; | |
| 2310 int curpos = 0; /* The current position in the list */ | |
| 2311 | |
| 2312 TRACE_ENTRY("%p %p %p %p %p", model_avp, list, count, firstpos, lastpos); | |
| 2313 | |
| 2314 *count = 0; /* number of instances found */ | |
| 2315 *firstpos = 0; /* position of the first instance */ | |
| 2316 *lastpos = 0; /* position of the last instance, starting from the end */ | |
| 2317 | |
| 2318 for (li = list->next; li != list; li = li->next) { | |
| 2319 /* Increment the current position counter */ | |
| 2320 curpos++; | |
| 2321 | |
| 2322 /* If we previously saved a "lastpos" information, increment it */ | |
| 2323 if (*lastpos != 0) | |
| 2324 (*lastpos)++; | |
| 2325 | |
| 2326 /* Check the type of the next AVP. We can compare the references directly, it is safe. */ | |
| 2327 if (_A(li->o)->avp_model == model_avp) { | |
| 2328 | |
| 2329 /* This AVP is of the type we are searching */ | |
| 2330 (*count)++; | |
| 2331 | |
| 2332 /* If we don't have yet a "firstpos", save it */ | |
| 2333 if (*firstpos == 0) | |
| 2334 *firstpos = curpos; | |
| 2335 | |
| 2336 /* Reset the lastpos */ | |
| 2337 (*lastpos) = 1; | |
| 2338 } | |
| 2339 } | |
| 2340 } | |
| 2341 | |
| 2342 /* We use this structure as parameter for the next function */ | |
| 2343 struct parserules_data { | |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2344 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
|
2345 struct fd_pei * pei; /* If the rule conflicts, save the error here */ |
| 0 | 2346 }; |
| 2347 | |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2348 /* 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
|
2349 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
|
2350 { |
|
35
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
2351 struct avp * avp = NULL; |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
2352 struct dict_avp_data avp_info; |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
2353 union avp_value val; |
|
400
bb8a4fa301b3
Fix compilation warning
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
387
diff
changeset
|
2354 unsigned char os[1] = { '\0' }; |
|
35
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
2355 |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
2356 /* Create an instance */ |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
2357 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
|
2358 |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
2359 /* Type of the AVP */ |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
2360 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
|
2361 |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
2362 /* Prepare the empty value */ |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
2363 memset(&val, 0, sizeof(val)); |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
2364 switch (avp_info.avp_basetype) { |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
2365 case AVP_TYPE_OCTETSTRING: |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
2366 val.os.data = os; |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
2367 val.os.len = sizeof(os); |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
2368 case AVP_TYPE_INTEGER32: |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
2369 case AVP_TYPE_INTEGER64: |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
2370 case AVP_TYPE_UNSIGNED32: |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
2371 case AVP_TYPE_UNSIGNED64: |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
2372 case AVP_TYPE_FLOAT32: |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
2373 case AVP_TYPE_FLOAT64: |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
2374 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
|
2375 case AVP_TYPE_GROUPED: |
|
bb8a4fa301b3
Fix compilation warning
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
387
diff
changeset
|
2376 /* For AVP_TYPE_GROUPED we don't do anything */ |
|
bb8a4fa301b3
Fix compilation warning
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
387
diff
changeset
|
2377 break; |
|
bb8a4fa301b3
Fix compilation warning
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
387
diff
changeset
|
2378 default: |
|
bb8a4fa301b3
Fix compilation warning
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
387
diff
changeset
|
2379 ASSERT(0); /* not handled */ |
|
35
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
2380 } |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
2381 |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
2382 return avp; |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2383 } |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2384 |
| 0 | 2385 /* Check that a list of AVPs is compliant with a given rule -- will be iterated on the list of rules */ |
| 2386 static int parserules_check_one_rule(void * data, struct dict_rule_data *rule) | |
| 2387 { | |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2388 int count, first, last, min; |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2389 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
|
2390 char * avp_name = "<unresolved name>"; |
| 0 | 2391 |
| 2392 TRACE_ENTRY("%p %p", data, rule); | |
| 2393 | |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2394 /* Get statistics of the AVP concerned by this rule in the parent instance */ |
| 0 | 2395 parserules_stat_avps( rule->rule_avp, pr_data->sentinel, &count, &first, &last); |
| 2396 | |
|
280
3019f6220122
Provide more useful debug information for non-ABNF-compliant messages
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
258
diff
changeset
|
2397 if (TRACE_BOOL(INFO)) |
| 0 | 2398 { |
| 2399 struct dict_avp_data avpdata; | |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2400 int ret; |
| 0 | 2401 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
|
2402 if (ret == 0) |
|
3019f6220122
Provide more useful debug information for non-ABNF-compliant messages
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
258
diff
changeset
|
2403 avp_name = avpdata.avp_name; |
| 0 | 2404 |
| 2405 TRACE_DEBUG(ANNOYING, "Checking rule: p:%d(%d) m/M:%2d/%2d. Counted %d (first: %d, last:%d) of AVP '%s'", | |
| 2406 rule->rule_position, | |
| 2407 rule->rule_order, | |
| 2408 rule->rule_min, | |
| 2409 rule->rule_max, | |
| 2410 count, | |
| 2411 first, | |
| 2412 last, | |
|
280
3019f6220122
Provide more useful debug information for non-ABNF-compliant messages
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
258
diff
changeset
|
2413 avp_name |
| 0 | 2414 ); |
| 2415 } | |
| 2416 | |
| 2417 /* Now check the rule is not conflicting */ | |
| 2418 | |
| 2419 /* Check the "min" value */ | |
| 2420 if ((min = rule->rule_min) == -1) { | |
| 2421 if (rule->rule_position == RULE_OPTIONAL) | |
| 2422 min = 0; | |
| 2423 else | |
| 2424 min = 1; | |
| 2425 } | |
| 2426 if (count < min) { | |
|
1062
56bf0377e2ff
Raise "Conflicting rules" to error level since it causes validation
Thomas Klausner <tk@giga.or.at>
parents:
1036
diff
changeset
|
2427 fd_log_error("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
|
2428 if (pr_data->pei) { |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2429 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
|
2430 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
|
2431 } |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2432 return EBADMSG; |
| 0 | 2433 } |
| 2434 | |
| 2435 /* Check the "max" value */ | |
| 2436 if ((rule->rule_max != -1) && (count > rule->rule_max)) { | |
|
1062
56bf0377e2ff
Raise "Conflicting rules" to error level since it causes validation
Thomas Klausner <tk@giga.or.at>
parents:
1036
diff
changeset
|
2437 fd_log_error("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
|
2438 if (pr_data->pei) { |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2439 if (rule->rule_max == 0) |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2440 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
|
2441 else |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2442 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
|
2443 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
|
2444 } |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2445 return EBADMSG; |
| 0 | 2446 } |
| 2447 | |
| 2448 /* Check the position and order (if relevant) */ | |
| 2449 switch (rule->rule_position) { | |
| 2450 case RULE_OPTIONAL: | |
| 2451 case RULE_REQUIRED: | |
| 2452 /* No special position constraints */ | |
| 2453 break; | |
| 2454 | |
| 2455 case RULE_FIXED_HEAD: | |
| 2456 /* Since "0*1<fixed>" is a valid rule specifier, we only reject cases where the AVP appears *after* its fixed position */ | |
| 2457 if (first > rule->rule_order) { | |
|
1062
56bf0377e2ff
Raise "Conflicting rules" to error level since it causes validation
Thomas Klausner <tk@giga.or.at>
parents:
1036
diff
changeset
|
2458 fd_log_error("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
|
2459 if (pr_data->pei) { |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2460 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
|
2461 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
|
2462 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
|
2463 } |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2464 return EBADMSG; |
| 0 | 2465 } |
| 2466 break; | |
| 2467 | |
| 2468 case RULE_FIXED_TAIL: | |
| 2469 /* Since "0*1<fixed>" is a valid rule specifier, we only reject cases where the AVP appears *before* its fixed position */ | |
| 2470 if (last > rule->rule_order) { /* We have a ">" here because we count in reverse order (i.e. from the end) */ | |
|
1062
56bf0377e2ff
Raise "Conflicting rules" to error level since it causes validation
Thomas Klausner <tk@giga.or.at>
parents:
1036
diff
changeset
|
2471 fd_log_error("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
|
2472 if (pr_data->pei) { |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2473 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
|
2474 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
|
2475 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
|
2476 } |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2477 return EBADMSG; |
| 0 | 2478 } |
| 2479 break; | |
| 2480 | |
| 2481 default: | |
| 2482 /* What is this position ??? */ | |
| 2483 ASSERT(0); | |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2484 return ENOTSUP; |
| 0 | 2485 } |
| 2486 | |
| 2487 /* 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
|
2488 return 0; |
| 0 | 2489 } |
| 2490 | |
| 2491 /* Check the rules recursively */ | |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2492 static int parserules_do ( struct dictionary * dict, msg_or_avp * object, struct fd_pei *error_info, int mandatory) |
| 0 | 2493 { |
| 2494 struct parserules_data data; | |
| 2495 struct dict_object * model = NULL; | |
| 2496 | |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2497 TRACE_ENTRY("%p %p %p %d", dict, object, error_info, mandatory); |
| 0 | 2498 |
| 2499 /* object has already been checked and dict-parsed when we are called. */ | |
| 2500 | |
| 2501 /* First, handle the cases where there is no model */ | |
| 2502 { | |
| 2503 if (CHECK_MSG(object)) { | |
| 2504 if ( _M(object)->msg_public.msg_flags & CMD_FLAG_ERROR ) { | |
| 2505 /* The case of error messages: the ABNF is different */ | |
| 2506 CHECK_FCT( fd_dict_get_error_cmd(dict, &model) ); | |
| 2507 } else { | |
| 2508 model = _M(object)->msg_model; | |
| 2509 } | |
| 2510 /* Commands MUST be supported in the dictionary */ | |
| 2511 if (model == NULL) { | |
| 2512 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
|
2513 if (error_info) { |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2514 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
|
2515 error_info->pei_protoerr = 1; |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2516 } |
| 0 | 2517 return EBADMSG; |
| 2518 } | |
| 2519 } | |
| 2520 | |
| 2521 /* AVP with the 'M' flag must also be recognized in the dictionary -- except inside an optional grouped AVP */ | |
| 2522 if (CHECK_AVP(object) && ((model = _A(object)->avp_model) == NULL)) { | |
| 2523 if ( mandatory && (_A(object)->avp_public.avp_flags & AVP_FLAG_MANDATORY)) { | |
| 2524 /* Return an error in this case */ | |
| 2525 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
|
2526 if (error_info) { |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2527 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
|
2528 error_info->pei_avp = object; |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2529 } |
| 0 | 2530 return EBADMSG; |
| 2531 } else { | |
| 2532 /* We don't know any rule for this object, so assume OK */ | |
| 2533 TRACE_DEBUG(FULL, "Unknown informational AVP, ignoring..."); | |
| 2534 return 0; | |
| 2535 } | |
| 2536 } | |
| 2537 } | |
| 2538 | |
| 2539 /* At this point we know "model" is set and points to the object's model */ | |
| 2540 | |
| 2541 /* If we are an AVP with no children, just return OK */ | |
| 2542 if (CHECK_AVP(object)) { | |
| 2543 struct dict_avp_data dictdata; | |
| 2544 CHECK_FCT( fd_dict_getval(model, &dictdata) ); | |
| 2545 if (dictdata.avp_basetype != AVP_TYPE_GROUPED) { | |
| 2546 /* This object has no children and no rules */ | |
| 2547 return 0; | |
| 2548 } | |
| 2549 } | |
| 2550 | |
| 2551 /* If this object has children, first check the rules for all its children */ | |
| 2552 { | |
| 2553 int is_child_mand = 0; | |
| 2554 struct fd_list * ch = NULL; | |
| 2555 if ( CHECK_MSG(object) | |
| 2556 || (mandatory && (_A(object)->avp_public.avp_flags & AVP_FLAG_MANDATORY)) ) | |
| 2557 is_child_mand = 1; | |
| 2558 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
|
2559 CHECK_FCT( parserules_do ( dict, _C(ch->o), error_info, is_child_mand ) ); |
| 0 | 2560 } |
| 2561 } | |
| 2562 | |
| 2563 /* Now check all rules of this object */ | |
| 2564 data.sentinel = &_C(object)->children; | |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2565 data.pei = error_info; |
|
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2566 CHECK_FCT( fd_dict_iterate_rules ( model, &data, parserules_check_one_rule ) ); |
| 0 | 2567 |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2568 return 0; |
| 0 | 2569 } |
| 2570 | |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2571 int fd_msg_parse_rules ( msg_or_avp * object, struct dictionary * dict, struct fd_pei *error_info) |
| 0 | 2572 { |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2573 TRACE_ENTRY("%p %p %p", object, dict, error_info); |
| 0 | 2574 |
|
35
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
2575 if (error_info) |
|
6486e97f56ae
Added test for modified message parsing
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
34
diff
changeset
|
2576 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
|
2577 |
| 0 | 2578 /* 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
|
2579 CHECK_FCT( fd_msg_parse_dict ( object, dict, error_info ) ); |
| 0 | 2580 |
| 2581 /* Call the recursive function */ | |
|
34
0e2b57789361
Backup for the WE, some warnings remaining
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
7
diff
changeset
|
2582 return parserules_do ( dict, object, error_info, 1 ) ; |
| 0 | 2583 } |
| 2584 | |
| 2585 /***************************************************************************************************************/ | |
| 2586 | |
| 2587 /* Compute the lengh of an object and its subtree. */ | |
| 2588 int fd_msg_update_length ( msg_or_avp * object ) | |
| 2589 { | |
| 2590 size_t sz = 0; | |
| 2591 struct dict_object * model; | |
| 2592 union { | |
| 2593 struct dict_cmd_data cmddata; | |
| 2594 struct dict_avp_data avpdata; | |
| 2595 } dictdata; | |
| 2596 | |
| 2597 TRACE_ENTRY("%p", object); | |
| 2598 | |
| 2599 /* Get the model of the object. This also validates the object */ | |
| 2600 CHECK_FCT( fd_msg_model ( object, &model ) ); | |
| 2601 | |
| 2602 /* Get the information of the model */ | |
| 2603 if (model) { | |
| 2604 CHECK_FCT( fd_dict_getval(model, &dictdata) ); | |
| 2605 } else { | |
| 2606 /* For unknown AVP, just don't change the size */ | |
| 2607 if (_C(object)->type == MSG_AVP) | |
| 2608 return 0; | |
| 2609 } | |
| 2610 | |
| 2611 /* Deal with easy cases: AVPs without children */ | |
| 2612 if ((_C(object)->type == MSG_AVP) && (dictdata.avpdata.avp_basetype != AVP_TYPE_GROUPED)) { | |
| 2613 /* Sanity check */ | |
| 2614 ASSERT(FD_IS_LIST_EMPTY(&_A(object)->avp_chain.children)); | |
| 2615 | |
| 2616 /* Now check that the data is set in the AVP */ | |
| 2617 CHECK_PARAMS( _A(object)->avp_public.avp_value ); | |
| 2618 | |
| 2619 sz = GETAVPHDRSZ( _A(object)->avp_public.avp_flags ); | |
| 2620 | |
| 2621 switch (dictdata.avpdata.avp_basetype) { | |
| 2622 case AVP_TYPE_OCTETSTRING: | |
| 2623 sz += _A(object)->avp_public.avp_value->os.len; | |
| 2624 break; | |
| 2625 | |
| 2626 case AVP_TYPE_INTEGER32: | |
| 2627 case AVP_TYPE_INTEGER64: | |
| 2628 case AVP_TYPE_UNSIGNED32: | |
| 2629 case AVP_TYPE_UNSIGNED64: | |
| 2630 case AVP_TYPE_FLOAT32: | |
| 2631 case AVP_TYPE_FLOAT64: | |
| 2632 sz += avp_value_sizes[dictdata.avpdata.avp_basetype]; | |
| 2633 break; | |
| 2634 | |
| 2635 default: | |
| 2636 /* Something went wrong... */ | |
| 2637 ASSERT(0); | |
| 2638 } | |
| 2639 } | |
| 2640 else /* message or grouped AVP */ | |
| 2641 { | |
| 2642 struct fd_list * ch = NULL; | |
| 2643 | |
| 2644 /* First, compute the header size */ | |
| 2645 if (_C(object)->type == MSG_AVP) { | |
| 2646 sz = GETAVPHDRSZ( _A(object)->avp_public.avp_flags ); | |
| 2647 } else { | |
| 2648 sz = GETMSGHDRSZ( ); | |
| 2649 } | |
| 2650 | |
| 2651 /* Recurse in all children and update the sz information */ | |
| 2652 for (ch = _C(object)->children.next; ch != &_C(object)->children; ch = ch->next) { | |
| 2653 CHECK_FCT( fd_msg_update_length ( ch->o ) ); | |
| 2654 | |
| 2655 /* Add the padded size to the parent */ | |
| 2656 sz += PAD4( _A(ch->o)->avp_public.avp_len ); | |
| 2657 } | |
| 2658 } | |
| 2659 | |
| 2660 /* When we arrive here, the "sz" variable contains the size to write in the object */ | |
| 2661 if (_C(object)->type == MSG_AVP) | |
| 2662 _A(object)->avp_public.avp_len = sz; | |
| 2663 else | |
| 2664 _M(object)->msg_public.msg_length = sz; | |
| 2665 | |
| 2666 return 0; | |
| 2667 } | |
| 2668 | |
| 2669 /***************************************************************************************************************/ | |
|
7
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2670 /* 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
|
2671 #define TEST_ACTION_STOP() \ |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2672 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
|
2673 goto out; |
|
7
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2674 |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2675 /* Call all dispatch callbacks for a given message */ |
|
1113
eb4ce68b6e5c
Added calls to remaining hooks
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1103
diff
changeset
|
2676 int fd_msg_dispatch ( struct msg ** msg, struct session * session, enum disp_action *action, char ** error_code, char ** drop_reason, struct msg ** drop_msg) |
|
7
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2677 { |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2678 struct dictionary * dict; |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2679 struct dict_object * app; |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2680 struct dict_object * cmd; |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2681 struct avp * avp; |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2682 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
|
2683 int ret = 0, r2; |
|
7
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2684 |
|
90
2c9444152e4b
Added the dispatch thread code
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
85
diff
changeset
|
2685 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
|
2686 CHECK_PARAMS( msg && CHECK_MSG(*msg) && action); |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2687 |
|
90
2c9444152e4b
Added the dispatch thread code
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
85
diff
changeset
|
2688 if (error_code) |
|
2c9444152e4b
Added the dispatch thread code
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
85
diff
changeset
|
2689 *error_code = NULL; |
|
1113
eb4ce68b6e5c
Added calls to remaining hooks
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1103
diff
changeset
|
2690 if (drop_reason) |
|
eb4ce68b6e5c
Added calls to remaining hooks
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1103
diff
changeset
|
2691 *drop_reason = NULL; |
| 132 | 2692 *action = DISP_ACT_CONT; |
|
90
2c9444152e4b
Added the dispatch thread code
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
85
diff
changeset
|
2693 |
|
7
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2694 /* Take the dispatch lock */ |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2695 CHECK_FCT( pthread_rwlock_rdlock(&fd_disp_lock) ); |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2696 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
|
2697 |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2698 /* First, call the DISP_HOW_ANY callbacks */ |
|
1113
eb4ce68b6e5c
Added calls to remaining hooks
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1103
diff
changeset
|
2699 CHECK_FCT_DO( ret = fd_disp_call_cb_int( NULL, msg, NULL, session, action, NULL, NULL, NULL, NULL, drop_reason, drop_msg ), goto out ); |
|
7
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2700 |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2701 TEST_ACTION_STOP(); |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2702 |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2703 /* 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
|
2704 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
|
2705 |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2706 /* 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
|
2707 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
|
2708 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
|
2709 |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2710 if (app == NULL) { |
|
90
2c9444152e4b
Added the dispatch thread code
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
85
diff
changeset
|
2711 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
|
2712 if (error_code) |
|
2c9444152e4b
Added the dispatch thread code
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
85
diff
changeset
|
2713 *error_code = "DIAMETER_APPLICATION_UNSUPPORTED"; |
|
2c9444152e4b
Added the dispatch thread code
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
85
diff
changeset
|
2714 *action = DISP_ACT_ERROR; |
|
2c9444152e4b
Added the dispatch thread code
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
85
diff
changeset
|
2715 } else { |
|
1113
eb4ce68b6e5c
Added calls to remaining hooks
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1103
diff
changeset
|
2716 *drop_reason = "Internal error: Received this answer to a local query with an unsupported application"; |
|
eb4ce68b6e5c
Added calls to remaining hooks
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1103
diff
changeset
|
2717 *drop_msg = *msg; |
|
90
2c9444152e4b
Added the dispatch thread code
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
85
diff
changeset
|
2718 *msg = NULL; |
|
2c9444152e4b
Added the dispatch thread code
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
85
diff
changeset
|
2719 } |
|
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
|
2720 goto out; |
|
7
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2721 } |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2722 |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2723 /* 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
|
2724 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
|
2725 while (avp != NULL) { |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2726 /* 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
|
2727 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
|
2728 struct dict_object * enumval = NULL; |
|
7
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2729 |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2730 /* 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
|
2731 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
|
2732 |
|
330
e283e18b2673
Removed incorrect ASSERT -- thanks to Alexandre for the bug finding.
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
291
diff
changeset
|
2733 /* 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
|
2734 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
|
2735 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
|
2736 /* 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
|
2737 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
|
2738 if (type) { |
|
e283e18b2673
Removed incorrect ASSERT -- thanks to Alexandre for the bug finding.
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
291
diff
changeset
|
2739 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
|
2740 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
|
2741 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
|
2742 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
|
2743 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
|
2744 } |
|
7
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2745 } |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2746 |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2747 /* Call the callbacks */ |
|
1113
eb4ce68b6e5c
Added calls to remaining hooks
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1103
diff
changeset
|
2748 CHECK_FCT_DO( ret = fd_disp_call_cb_int( cb_list, msg, avp, session, action, app, cmd, avp->avp_model, enumval, drop_reason, drop_msg ), goto out ); |
|
7
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2749 TEST_ACTION_STOP(); |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2750 } |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2751 /* 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
|
2752 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
|
2753 } |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2754 |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2755 /* 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
|
2756 CHECK_FCT_DO( ret = fd_dict_disp_cb(DICT_COMMAND, cmd, &cb_list), goto out ); |
|
1113
eb4ce68b6e5c
Added calls to remaining hooks
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1103
diff
changeset
|
2757 CHECK_FCT_DO( ret = fd_disp_call_cb_int( cb_list, msg, NULL, session, action, app, cmd, NULL, NULL, drop_reason, drop_msg ), goto out ); |
|
7
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2758 TEST_ACTION_STOP(); |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2759 |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2760 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
|
2761 CHECK_FCT_DO( ret = fd_dict_disp_cb(DICT_APPLICATION, app, &cb_list), goto out ); |
|
1113
eb4ce68b6e5c
Added calls to remaining hooks
Sebastien Decugis <sdecugis@freediameter.net>
parents:
1103
diff
changeset
|
2762 CHECK_FCT_DO( ret = fd_disp_call_cb_int( cb_list, msg, NULL, session, action, app, cmd, NULL, NULL, drop_reason, drop_msg ), goto out ); |
|
7
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2763 TEST_ACTION_STOP(); |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2764 } |
|
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
|
2765 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
|
2766 ; /* some systems would complain without this */ |
|
7
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2767 pthread_cleanup_pop(0); |
|
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2768 |
|
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
|
2769 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
|
2770 return ret ?: r2; |
|
7
e5af94b04946
Added dispatch module and tests
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
4
diff
changeset
|
2771 } |
|
687
026802543f57
Prepare for new message log facility
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
686
diff
changeset
|
2772 |
|
026802543f57
Prepare for new message log facility
Sebastien Decugis <sdecugis@nict.go.jp>
parents:
686
diff
changeset
|
2773 |