Changeset 34:0e2b57789361 in freeDiameter for include

Timestamp:

Oct 30, 2009, 5:23:06 PM (15 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Backup for the WE, some warnings remaining

Location:

include/freeDiameter

Files:

• freeDiameter.h (modified) (1 diff)
• libfreeDiameter.h (modified) (4 diffs)

include/freeDiameter/freeDiameter.h

@@ -492 +492 @@
 int fd_msg_add_origin ( struct msg * msg, int osi ); 
 
+/* Parse a message against our dictionary, and in case of error log and eventually build the error reply (on return and EBADMSG, *msg == NULL or *msg is the error message ready to send) */
+int fd_msg_parse_or_error( struct msg ** msg );
 
 

include/freeDiameter/libfreeDiameter.h

@@ -1990 +1990 @@
  *  !0          : an error occurred.
  */
-int fd_msg_source_set( struct msg * msg, char * diamid, uint32_t hash, int add_rr, struct dictionary * dict );
-int fd_msg_source_get( struct msg * msg, char ** diamid, uint32_t *hash );
+int fd_msg_source_set( struct msg * msg, char * diamid, int add_rr, struct dictionary * dict );
+int fd_msg_source_get( struct msg * msg, char ** diamid );
 
 /*
@@ -2138 +2138 @@
 int fd_msg_parse_dict ( msg_or_avp * object, struct dictionary * dict );
 
+/* Parsing Error Information structure */
+struct fd_pei {
+        char *          pei_errcode;    /* name of the error code to use */
+        struct avp *    pei_avp;        /* pointer to invalid or missing AVP (to be freed) */
+        char *          pei_message;    /* Overwrite default message if needed */
+        int             pei_protoerr;   /* do we set the 'E' bit in the error message ? */
+};
+
 /*
  * FUNCTION:    fd_msg_parse_rules
@@ -2144 +2152 @@
  *  object      : A msg or grouped avp object that must be verified.
  *  dict        : The dictionary containing the rules definitions.
- *  rule        : If not NULL, the first conflicting rule will be saved here if a conflict is found.
+ *  error_info  : If not NULL, the first problem information will be saved here.
  *
  * DESCRIPTION: 
@@ -2155 +2163 @@
  *  ENOMEM      : Unable to allocate enough memory to complete the operation.
  */
-int fd_msg_parse_rules ( msg_or_avp * object, struct dictionary * dict, struct dict_object ** rule);
+int fd_msg_parse_rules ( msg_or_avp * object, struct dictionary * dict, struct fd_pei *error_info);
+