Changeset 1154:0b95a3afbfc3 in freeDiameter for libfdcore

Timestamp:

May 27, 2013, 6:22:40 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Return DIAMETER_LOOP_DETECTED if local peer is already in the Route-Record AVP of a new received request.

File:

• libfdcore/routing_dispatch.c (modified) (2 diffs)

libfdcore/routing_dispatch.c

@@ -588 +588 @@
                 }
 
-                /* Parse the message for Dest-Host and Dest-Realm */
+                /* Parse the message for Dest-Host, Dest-Realm, and Route-Record */
                 CHECK_FCT(  fd_msg_browse(msgptr, MSG_BRW_FIRST_CHILD, &avp, NULL)  );
                 while (avp) {
@@ -664 +664 @@
                                                 un_val = ahdr->avp_value;
                                                 break;
+                                                
+                                        case AC_ROUTE_RECORD:
+                                                /* Parse this AVP */
+                                                CHECK_FCT_DO( ret = fd_msg_parse_dict ( avp, fd_g_config->cnf_dict, &error_info ),
+                                                        {
+                                                                if (error_info.pei_errcode) {
+                                                                        fd_hook_call(HOOK_MESSAGE_PARSING_ERROR, msgptr, NULL, error_info.pei_message ?: error_info.pei_errcode, fd_msg_pmdl_get(msgptr));
+                                                                        CHECK_FCT( return_error( &msgptr, error_info.pei_errcode, error_info.pei_message, error_info.pei_avp) );
+                                                                        return 0;
+                                                                } else {
+                                                                        fd_hook_call(HOOK_MESSAGE_PARSING_ERROR, msgptr, NULL, "Unspecified error while parsing Route-Record AVP", fd_msg_pmdl_get(msgptr));
+                                                                        return ret;
+                                                                }
+                                                        } );
+                                                ASSERT( ahdr->avp_value );
+                                                /* Is this our own name ? */
+                                                if (!fd_os_almostcasesrch(ahdr->avp_value->os.data, ahdr->avp_value->os.len, fd_g_config->cnf_diamid, fd_g_config->cnf_diamid_len, NULL)) {
+                                                        /* Yes: then we must return DIAMETER_LOOP_DETECTED according to Diameter RFC */
+                                                        char * error = "DIAMETER_LOOP_DETECTED";
+                                                        fd_hook_call(HOOK_MESSAGE_PARSING_ERROR, msgptr, NULL, error, fd_msg_pmdl_get(msgptr));
+                                                        CHECK_FCT( return_error( &msgptr, error, NULL, NULL) );
+                                                        return 0;
+                                                }
+                                                break;
+                                                
+                                        
                                 }
                         }