Changeset 1103:d8591b1c56cd in freeDiameter for libfdcore/messages.c

Timestamp:

May 10, 2013, 7:48:57 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Implemented a few hooks

File:

• libfdcore/messages.c (modified) (5 diffs)

libfdcore/messages.c

@@ -346 +346 @@
 
 /* Parse a message against our dictionary, and in case of error log and eventually build the error reply -- returns the parsing status */
-int fd_msg_parse_or_error( struct msg ** msg )
+int fd_msg_parse_or_error( struct msg ** msg, struct msg **error)
 {
         int ret = 0;
@@ -355 +355 @@
         TRACE_ENTRY("%p", msg);
         
-        CHECK_PARAMS(msg && *msg);
+        CHECK_PARAMS(msg && *msg && error);
         m = *msg;
+        *error = NULL;
         
         /* Parse the message against our dictionary */
@@ -364 +365 @@
                 return ret; /* 0 or another error */
         
-        TRACE_DEBUG(INFO, "A message does not comply to the dictionary and/or rules (%s)", pei.pei_errcode);
-        fd_msg_dump_walk(FULL, m);
+        /* Log */
+        fd_hook_call(HOOK_MESSAGE_PARSING_ERROR, m, NULL, pei.pei_message ?: pei.pei_errcode, fd_msg_pmdl_get(m));
         
         CHECK_FCT( fd_msg_hdr(m, &hdr) );
@@ -373 +374 @@
                 
                 /* Create the error message */
-                CHECK_FCT( fd_msg_new_answer_from_req ( fd_g_config->cnf_dict, msg, pei.pei_protoerr ? MSGFL_ANSW_ERROR : 0 ) );
+                CHECK_FCT( fd_msg_new_answer_from_req ( fd_g_config->cnf_dict, &m, pei.pei_protoerr ? MSGFL_ANSW_ERROR : 0 ) );
                 
                 /* Set the error code */
-                CHECK_FCT( fd_msg_rescode_set(*msg, pei.pei_errcode, pei.pei_message, pei.pei_avp, 1 ) );
+                CHECK_FCT( fd_msg_rescode_set(m, pei.pei_errcode, pei.pei_message, pei.pei_avp, 1 ) );
+                
+                *msg = NULL;
+                *error = m;
                 
         } else {
@@ -409 +413 @@
                                         default: /* Other errors */
                                                 /* We let the application decide what to do with the message, we rescue it */
-                                                return 0;
+                                                *error = m;
                                 }
                         }
                 } while (0);
-                
-                /* Just discard */
-                //fd_msg_log( FD_MSG_LOG_DROPPED, m, "Answer not compliant to dictionary's ABNF (%s)", pei.pei_errcode  );
-                CHECK_FCT( fd_msg_free( m ) );
-                *msg = NULL;
         }