Changeset 528:1b3b9790e7cb in freeDiameter

Timestamp:

Sep 3, 2010, 4:46:16 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Add a new field in the app_acct.fdx database to receive the name of the local server.

Update your existing tables with the following SQL command:
ALTER TABLE "incoming" ADD "recorded_serv" bytea NOT NULL;

Files:

• doc/app_acct.conf.sample (modified) (3 diffs)
• extensions/app_acct/acct_conf.l (modified) (1 diff)
• extensions/app_acct/acct_conf.y (modified) (5 diffs)
• extensions/app_acct/acct_db.c (modified) (2 diffs)
• extensions/app_acct/app_acct.h (modified) (1 diff)

doc/app_acct.conf.sample

@@ -45 +45 @@
 #
 # Note that at the moment, GROUPED AVP are not supported. Also, only the top-level AVPs are
-# search. This behavior can be changed quite easily if needed.
+# searched. This behavior can be changed quite easily if needed.
 
 # The following list is informative only.
@@ -108 +108 @@
 
 # This is the database table corresponding to this list:
-# CREATE TABLE app_acct (
+# CREATE TABLE incoming (
 #     "recorded_on" timestamp with time zone NOT NULL,
+#     "recorded_serv" bytea NOT NULL,
 #     "Origin-Host" bytea NOT NULL,
 #     "Origin-Realm" bytea NOT NULL,
@@ -195 +196 @@
 # Optionaly, you can specify a name of a field that will receive the value 'now' when a new record is inserted.
 # Default: no timestamp is inserted.
-# Example: Timestamp_field = "inc_ts";
-
-
-
-
-
+# Example: Timestamp_field = "recorded_on";
+
+# Server_name_field:
+# Optionaly, you can specify a field which will receive the Diameter Identity of the local server for each record saved.
+# This is useful especially if you have several Accounting servers and want to check Load-Balancing behavior or so,
+# after aggregating all the data.
+# Default: no server name inserted.
+# Example: Server_name_field = "recorded_serv";
+
+
+

extensions/app_acct/acct_conf.l

@@ -114 +114 @@
                         }
 
+(?i:"Server_name_field") {
+                                return SRVNFIELD;
+                        }
+
 (?i:"field")            {
                                 return FIELD;

extensions/app_acct/acct_conf.y

@@ -102 +102 @@
         fd_log_debug("   Table name .... : '%s'\n", acct_config->tablename ?: "<null>");
         fd_log_debug("   Timestamp field : '%s'\n", acct_config->tsfield ?: "<null>");
+        fd_log_debug("   Server name fld : '%s'\n", acct_config->srvnfield ?: "<null>");
         fd_log_debug(" AVPs that will be saved to the database:\n");
         for (li = acct_config->avps.next; li != &acct_config->avps; li = li->next) {
@@ -137 +138 @@
         free(acct_config->tablename);
         free(acct_config->tsfield);
+        free(acct_config->srvnfield);
         
         /* Done */
@@ -205 +207 @@
 %token          TABLE
 %token          TSFIELD
+%token          SRVNFIELD
 
 /* Tokens and types */
@@ -224 +227 @@
                         | conffile tableline
                         | conffile tsfieldline
+                        | conffile srvnfieldline
                         | conffile errors
                         {
@@ -321 +325 @@
                         }
                         ;
+
+srvnfieldline:          SRVNFIELD '=' QSTRING ';'
+                        {
+                                if (acct_config->srvnfield) {
+                                        yyerror (&yylloc, conffile, "Duplicate entry");
+                                        YYERROR;
+                                }
+                                acct_config->srvnfield = $3
+                        }
+                        ;

extensions/app_acct/acct_db.c

@@ -142 +142 @@
         }
         
+        if (acct_config->srvnfield) {
+                ADD_EXTEND("\"");
+                ADD_ESCAPE(acct_config->srvnfield);
+                ADD_EXTEND("\", ");
+        }
+        
         for (li = emptyrecords.all.next; li != &emptyrecords.all; li = li->next) {
                 struct acct_record_item * i = (struct acct_record_item *)(li->o);
@@ -158 +164 @@
         if (acct_config->tsfield) {
                 ADD_EXTEND("$%d, ", ++idx);
+        }
+        if (acct_config->srvnfield) {
+                ADD_EXTEND("\"");
+                ADD_ESCAPE(fd_g_config->cnf_diamid);
+                ADD_EXTEND("\", ");
         }
         

extensions/app_acct/app_acct.h

@@ -75 +75 @@
         char            *tablename;     /* the name of the table we are working with */
         char            *tsfield;       /* the name of the timestamp field, or NULL if not required */
+        char            *srvnfield;     /* the name of the server name field, or NULL if not required */
 };