Changeset 43:2db15632a63d in freeDiameter for freeDiameter/dispatch.c

Timestamp:

Nov 25, 2009, 7:07:09 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Added a large part of connection establishment logic, to test

File:

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

freeDiameter/dispatch.c

@@ -36 +36 @@
 #include "fD.h"
 
+/* Add an application into the peer's supported apps */
 int fd_disp_app_support ( struct dict_object * app, struct dict_object * vendor, int auth, int acct )
 {
+        application_id_t aid = 0;
         vendor_id_t      vid = 0;
-        application_id_t aid = 0;
-        struct fd_list * li;
-        int skip = 0;
         
         TRACE_ENTRY("%p %p %d %d", app, vendor, auth, acct);
@@ -54 +53 @@
                 aid = data.application_id;
         }
-        
-        
-        /* Now insert in the list ordered by appid. Avoid duplicates */
-        for (li = &fd_g_config->cnf_apps; li->next != &fd_g_config->cnf_apps; li = li->next) {
-                struct fd_app * na = (struct fd_app *)(li->next);
-                if (na->appid < aid)
-                        continue;
-                
-                if (na->appid > aid)
-                        break;
-                
-                /* Otherwise, we merge with existing entry -- ignore vendor id in this case */
-                skip = 1;
-                
-                if (auth)
-                        na->flags.auth = 1;
-                if (acct)
-                        na->flags.acct = 1;
-                break;
+
+        if (vendor) {
+                enum dict_object_type type = 0;
+                struct dict_vendor_data data;
+                CHECK_FCT( fd_dict_gettype(vendor, &type) );
+                CHECK_PARAMS( type == DICT_VENDOR );
+                CHECK_FCT( fd_dict_getval(vendor, &data) );
+                vid = data.vendor_id;
         }
         
-        if (!skip) {                    
-                struct fd_app  * new = NULL;
-
-                if (vendor) {
-                        enum dict_object_type type = 0;
-                        struct dict_vendor_data data;
-                        CHECK_FCT( fd_dict_gettype(vendor, &type) );
-                        CHECK_PARAMS( type == DICT_VENDOR );
-                        CHECK_FCT( fd_dict_getval(vendor, &data) );
-                        vid = data.vendor_id;
-                }
-        
-                CHECK_MALLOC( new = malloc(sizeof(struct fd_app)) );
-                memset(new, 0, sizeof(struct fd_app));
-                fd_list_init(&new->chain, NULL);
-                new->flags.auth = (auth ? 1 : 0);
-                new->flags.acct = (acct ? 1 : 0);
-                new->vndid = vid;
-                new->appid = aid;
-                fd_list_insert_after(li, &new->chain);
-        }
-        
-        return 0;
+        return fd_app_merge(&fd_g_config->cnf_apps, aid, vid, auth, acct);
 }