Changeset 292:a77ed0e30ac9 in freeDiameter

Timestamp:

May 10, 2010, 2:26:42 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Fix non-working timestamp field

File:

• extensions/app_acct/acct_db.c (modified) (4 diffs)

extensions/app_acct/acct_db.c

@@ -158 +158 @@
         
         if (acct_config->tsfield) {
-                ADD_EXTEND("'now', ");
+                ADD_EXTEND("$%d, ", ++idx);
         }
         
         for (li = emptyrecords.all.next; li != &emptyrecords.all; li = li->next) {
                 struct acct_record_item * i = (struct acct_record_item *)(li->o);
-                idx += 1;
-                ADD_EXTEND("$%d::%s", idx, diam2db_types_mapping[i->param->avptype]);
+                ADD_EXTEND("$%d::%s", ++idx, diam2db_types_mapping[i->param->avptype]);
                 
                 if (li->next != &emptyrecords.all) {
@@ -207 +206 @@
         int      *val_isbin;
         int       idx = 0;
+        int       size = 0;
         PGresult *res;
         struct fd_list *li;
@@ -224 +224 @@
         }
         
+        size =  acct_config->tsfield ? records->nball + 1 : records->nball;
+        
         /* Alloc the arrays of parameters */
-        CHECK_MALLOC( val       = calloc(records->nball, sizeof(const char *)) );
-        CHECK_MALLOC( val_len   = calloc(records->nball, sizeof(const int)) );
-        CHECK_MALLOC( val_isbin = calloc(records->nball, sizeof(const int)) );
+        CHECK_MALLOC( val       = calloc(size, sizeof(const char *)) );
+        CHECK_MALLOC( val_len   = calloc(size, sizeof(const int)) );
+        CHECK_MALLOC( val_isbin = calloc(size, sizeof(const int)) );
+        
+        if (acct_config->tsfield) {
+                val[idx] = "now";
+                val_len[idx] = 3;
+                val_isbin[idx] = 0;
+                idx++;
+        }
         
         /* Now write all the map'd records in these arrays */
@@ -265 +274 @@
         
         /* OK, now execute the SQL statement */
-        res = PQexecPrepared(conn, stmt, records->nball, (const char * const *)val, val_len, val_isbin, 1 /* We actually don't care here */);
+        res = PQexecPrepared(conn, stmt, size, (const char * const *)val, val_len, val_isbin, 1 /* We actually don't care here */);
         
         /* Done with the parameters */