Changeset 772:c6969f1af9f3 in freeDiameter

Timestamp:

Nov 1, 2011, 6:12:18 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Fix app_acct and associated test

Files:

• extensions/app_acct/acct_db.c (modified) (7 diffs)
• tests/testappacct.c (modified) (1 diff)

extensions/app_acct/acct_db.c

@@ -59 +59 @@
 #endif /* TEST_DEBUG */
 pthread_key_t connk;
+static char * sql = NULL;   /* The buffer that will contain the SQL query */
+static int nbrecords = 0;
 
 
@@ -66 +68 @@
         struct acct_record_list emptyrecords;
         struct fd_list * li;
-        char * sql=NULL;   /* The buffer that will contain the SQL query */
         size_t sql_allocd = 0; /* The malloc'd size of the buffer */
         size_t sql_offset = 0; /* The actual data already written in this buffer */
@@ -197 +198 @@
         }
         PQclear(res);
-        
-        free(sql);
+        nbrecords = emptyrecords.nball;
+        
         acct_rec_empty(&emptyrecords);
         
@@ -212 +213 @@
 {       
         CHECK_POSIX_DO(pthread_key_delete(connk) , );
+        free(sql);
 }
 
@@ -225 +227 @@
         struct fd_list *li;
         PGconn *conn;
+        int new = 0;
         
         TRACE_ENTRY("%p", records);
@@ -233 +236 @@
                 conn = PQconnectdb(acct_config->conninfo);
                 CHECK_POSIX( pthread_setspecific(connk, conn) );
+                
+                new = 1;
         }
         
@@ -244 +249 @@
                         return ENOTCONN;
                 }
+        }
+        
+        if (new) {
+                /* Create the prepared statement for this ocnnection, it is not shared */
+                res = PQprepare(conn, stmt, sql, nbrecords, NULL);
+                if (PQresultStatus(res) != PGRES_COMMAND_OK) {
+                        TRACE_DEBUG(INFO, "Preparing statement '%s' failed: %s",
+                                sql, PQerrorMessage(conn));
+                        PQclear(res);
+                        return EINVAL;
+                }
+                PQclear(res);
         }
         

tests/testappacct.c

@@ -253 +253 @@
         {
                 PGresult * res;
-                char * s;
+                uint8_t * bs;
+                char * es;
+                size_t l;
+                int i;
                 res = PQexec(conn, "SELECT \"Session-Id\" from " TABLE ";");
                 CHECK( PGRES_TUPLES_OK, PQresultStatus(res) );
                 
                 /* We also check that the Session-Id we retrieve is the same as what we generated earlier (not trashed in the process) */
-                s = PQgetvalue(res, 0, 0);
-                CHECK( 0, strcmp(s, (char *)sess_bkp) );
+                es = PQgetvalue(res, 0, 0);
+                bs = PQunescapeBytea((uint8_t *)es, &l);
+                
+                CHECK( 0, fd_os_cmp(bs, l, sess_bkp, sess_bkp_len) );
                 
                 PQclear(res);
+                PQfreemem(bs);
         }