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