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