Changeset 105:0d9c9e004be0 in freeDiameter

Timestamp:

Dec 8, 2009, 1:38:43 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Compute common applications after CER reception

Files:

• freeDiameter/apps.c (modified) (1 diff)
• freeDiameter/config.c (modified) (1 diff)
• freeDiameter/p_ce.c (modified) (4 diffs)
• include/freeDiameter/freeDiameter.h (modified) (2 diffs)

freeDiameter/apps.c

@@ -100 +100 @@
         return 0;
 }
+
+/* Check if two lists have at least one common application */
+int fd_app_check_common(struct fd_list * list1, struct fd_list * list2, int * common_found)
+{
+        struct fd_list * li1, *li2;
+        
+        TRACE_ENTRY("%p %p %p", list1, list2, common_found);
+        CHECK_PARAMS( list1 && list2 && common_found );
+        
+        /* Both lists are ordered, so advance both pointers at the same time */
+        for (li1 = list1->next, li2 = list2->next;  (li1 != list1) && (li2 != list2); ) {
+                struct fd_app * a1 = (struct fd_app *)li1, *a2 = (struct fd_app *)li2;
+                if (a1->appid < a2->appid) {
+                        li1 = li1->next;
+                        continue;
+                }
+                if (a1->appid > a2->appid) {
+                        li2 = li2->next;
+                        continue;
+                }
+                /* They are equal, compare the applications */
+                if ((a1->flags.auth && a2->flags.auth) || (a1->flags.acct && a2->flags.acct)) {
+                        /* found! */
+                        *common_found = 1;
+                        return 0;
+                }
+                
+                /* This application is not common, advance both lists */
+                li1 = li1->next;
+                li2 = li2->next;
+        }
+        
+        /* We did not find a common app */
+        *common_found = 0;
+        return 0;
+}

freeDiameter/config.c

@@ -111 +111 @@
                                         app->flags.auth ? "Au" : "--",
                                         app->flags.acct ? "Ac" : "--",
-                                        app->flags.common ? "C" : "-",
                                         app->vndid);
                         li = li->next;

freeDiameter/p_ce.c

@@ -704 +704 @@
 }
 
-/* Handle the receiver side after winning an election (or timeout on initiator side) */
+/* Handle the receiver side to go to OPEN state (any election is resolved) */
 int fd_p_ce_process_receiver(struct fd_peer * peer)
 {
@@ -710 +710 @@
         struct msg * msg = NULL;
         int isi = 0;
+        int fatal = 0;
         
         TRACE_ENTRY("%p", peer);
@@ -731 +732 @@
         
         /* Check if we have common applications */
-        TODO("DIAMETER_NO_COMMON_APPLICATION ?");
+        if ( fd_g_config->cnf_flags.no_fwd && (! peer->p_hdr.info.runtime.pir_relay) ) {
+                int got_common;
+                CHECK_FCT( fd_app_check_common( &fd_g_config->cnf_apps, &peer->p_hdr.info.runtime.pir_apps, &got_common) );
+                if (!got_common) {
+                        TRACE_DEBUG(INFO, "No common application with peer '%s', sending DIAMETER_NO_COMMON_APPLICATION", peer->p_hdr.info.pi_diamid);
+                        ec = "DIAMETER_NO_COMMON_APPLICATION";
+                        fatal = 1;
+                        goto error_abort;
+                }
+        }
         
         /* Do we send ISI back ? */
@@ -808 +818 @@
 
         /* Send the error to the peer */
-        CHECK_FCT( fd_event_send(peer->p_events, FDEVP_CNX_ERROR, 0, NULL) );
+        CHECK_FCT( fd_event_send(peer->p_events, fatal ? FDEVP_TERMINATE : FDEVP_CNX_ERROR, 0, NULL) );
 
         return 0;

include/freeDiameter/freeDiameter.h

@@ -699 +699 @@
                 unsigned auth   : 1;
                 unsigned acct   : 1;
-                unsigned common : 1;
         }                flags;
         vendor_id_t      vndid; /* if not 0, Vendor-Specific-App-Id AVP will be used */
@@ -707 +706 @@
 int fd_app_merge(struct fd_list * list, application_id_t aid, vendor_id_t vid, int auth, int acct);
 int fd_app_check(struct fd_list * list, application_id_t aid, struct fd_app **detail);
+int fd_app_check_common(struct fd_list * list1, struct fd_list * list2, int * common_found);
 
 #endif /* _FREEDIAMETER_H */