Insert into psk_keys_tab not psk_keys

[trust_router.git] / tid / example / tids_main.c

diff --git a/tid/example/tids_main.c b/tid/example/tids_main.c
index 313e457..f60ed0b 100644 (file)
--- a/tid/example/tids_main.c
+++ b/tid/example/tids_main.c
@@ -173,11 +173,11 @@ static int tids_req_handler (TIDS_INSTANCE *tids,
 
 
   /* Allocate a new server block */
-  if (NULL == (resp->servers = malloc(sizeof(TID_SRVR_BLK)))){
+  if (NULL == (resp->servers = talloc_zero(resp, TID_SRVR_BLK))){
     tr_crit("tids_req_handler(): malloc failed.");
     return -1;
   }
-  memset(resp->servers, 0, sizeof(TID_SRVR_BLK));
+
   resp->num_servers = 1;
 
   /* TBD -- Set up the server IP Address */
@@ -231,7 +231,7 @@ static int tids_req_handler (TIDS_INSTANCE *tids,
   if (req->expiration_interval < 1)
     req->expiration_interval = 1;
   g_get_current_time(&resp->servers->key_expiration);
-  resp->servers->key_expiration.tv_sec += req->expiration_interval;
+  resp->servers->key_expiration.tv_sec += req->expiration_interval * 60 /*in minutes*/;
 
   if (NULL != insert_stmt) {
     int sqlite3_result;
@@ -239,7 +239,7 @@ static int tids_req_handler (TIDS_INSTANCE *tids,
         sqlite3_bind_text(insert_stmt, 1, key_id, -1, SQLITE_TRANSIENT);
     sqlite3_bind_blob(insert_stmt, 2, s_keybuf, s_keylen, SQLITE_TRANSIENT);
     sqlite3_bind_blob(insert_stmt, 3, pub_digest, pub_digest_len, SQLITE_TRANSIENT);
-        sqlite3_bind_text(insert_stmt, 3, expiration_str, -1, SQLITE_TRANSIENT);
+        sqlite3_bind_text(insert_stmt, 4, expiration_str, -1, SQLITE_TRANSIENT);
     sqlite3_result = sqlite3_step(insert_stmt);
     if (SQLITE_DONE != sqlite3_result)
       tr_crit("sqlite3: failed to write to database");
@@ -279,6 +279,9 @@ int main (int argc,
     exit(1);
   }
 
+  /* Use standalone logging */
+  tr_log_open();
+
   /* set logging levels */
   tr_log_threshold(LOG_CRIT);
   tr_console_threshold(LOG_DEBUG);
@@ -291,7 +294,7 @@ int main (int argc,
     exit(1);
   }
   sqlite3_busy_timeout( db, 1000);
-  sqlite3_prepare_v2(db, "insert into psk_keys (keyid, key, client_dh_pub, key_expiration) values(?, ?, ?, ?)",
+  sqlite3_prepare_v2(db, "insert into psk_keys_tab (keyid, key, client_dh_pub, key_expiration) values(?, ?, ?, ?)",
                     -1, &insert_stmt, NULL);
   sqlite3_prepare_v2(db, "insert into authorizations (client_dh_pub, coi, acceptor_realm, hostname, apc) values(?, ?, ?, ?, ?)",
                     -1, &authorization_insert, NULL);