Changeset 116:638647100330 in freeDiameter for freeDiameter/messages.c

Timestamp:

Dec 8, 2009, 5:30:01 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Changed function to accept invalid ABNF in error messages

File:

• freeDiameter/messages.c (modified) (2 diffs)

freeDiameter/messages.c

@@ -300 +300 @@
         fd_msg_dump_walk(NONE, m);
         
+        CHECK_FCT( fd_msg_hdr(m, &hdr) );
+        
         /* Now create an answer error if the message is a query */
-        CHECK_FCT( fd_msg_hdr(m, &hdr) );
-        
         if (hdr->msg_flags & CMD_FLAG_REQUEST) {
                 
@@ -312 +312 @@
                 
         } else {
+                do { /* Rescue error messages */
+                        struct avp * avp;
+                        union avp_value * rc = NULL;
+                        
+                        /* Search the Result-Code AVP */
+                        CHECK_FCT_DO(  fd_msg_browse(*msg, MSG_BRW_FIRST_CHILD, &avp, NULL), break  );
+                        while (avp) {
+                                struct avp_hdr * ahdr;
+                                CHECK_FCT_DO(  fd_msg_avp_hdr( avp, &ahdr ), break  );
+                                
+                                if ((ahdr->avp_code == AC_RESULT_CODE) && (! (ahdr->avp_flags & AVP_FLAG_VENDOR)) ) {
+                                        /* Parse this AVP */
+                                        ASSERT( ahdr->avp_value );
+                                        rc = ahdr->avp_value;
+                                        break;
+                                }
+                                
+                                /* Go to next AVP */
+                                CHECK_FCT_DO(  fd_msg_browse(avp, MSG_BRW_NEXT, &avp, NULL), break  );
+                        }
+                        
+                        if (rc) {
+                                switch (rc->u32 / 1000) {
+                                        case 1: /* 1xxx : Informational */
+                                        case 2: /* 2xxx : Sucess */
+                                                /* In these cases, we want the message to validate the ABNF, so we will discard the bad message */
+                                                break;
+                                                
+                                        default: /* Other errors */
+                                                /* We let the application decide what to do with the message, we rescue it */
+                                                return 0;
+                                }
+                        }
+                } while (0);
+                
                 /* Just discard */
                 CHECK_FCT( fd_msg_free( m ) );