cscvs to tla changeset 33

[onak.git] / keydb_db2.c

diff --git a/keydb_db2.c b/keydb_db2.c
index 6aa47c099b34973ac319cd61e02965ad41101f15..1303cd80824312d48f1f628a93056040199331b6 100644 (file)
--- a/keydb_db2.c
+++ b/keydb_db2.c
@@ -16,14 +16,15 @@
 #include <string.h>
 #include <unistd.h>
 
 #include <string.h>
 #include <unistd.h>
 

+#include "charfuncs.h"

 #include "keydb.h"
 #include "keyid.h"
 #include "keyindex.h"
 #include "keystructs.h"
 #include "mem.h"
 #include "keydb.h"
 #include "keyid.h"
 #include "keyindex.h"
 #include "keystructs.h"
 #include "mem.h"

+#include "onak-conf.h"

 #include "parsekey.h"
 
 #include "parsekey.h"
 

-#define DBDIR "/community/pgp-keyserver/db-copy"

 #define KEYDB_KEYID_BYTES 4
 
 /**
 #define KEYDB_KEYID_BYTES 4
 
 /**


@@ -41,40 +42,6 @@ static DB **db2_keydbfiles = NULL;
  */
 static DB_ENV db2_env;
 
  */
 static DB_ENV db2_env;
 

-/*
- * Shared with CGI buffer stuff...
- */
-struct db2_get_ctx {
-       char *buffer;
-       int offset;
-       int size;
-};
-
-/**
- *     keydb_fetchchar - Fetches a char from a buffer.
- */
-int keydb_fetchchar(void *ctx, int count, unsigned char *c)
-{
-       struct db2_get_ctx *buf = NULL;
-       int i;
-       
-       buf = (struct db2_get_ctx *) ctx;
-       for (i = 0; i < count; i++) {
-               c[i] = buf->buffer[buf->offset++];
-       }
-
-       return (((buf->offset) == (buf->size)) ? 1 : 0);
-}
-
-/**
- *     keydb_putchar - Puts a char to a file.
- */
-static int keydb_putchar(void *fd, unsigned char c)
-{
-//     return !(lo_write(dbconn, *(int *) fd, &c, sizeof(c)));
-       return 1;
-}
-

 DB *keydb(DBT *key)
 {
        /*
 DB *keydb(DBT *key)
 {
        /*


@@ -111,7 +78,8 @@ void initdb(void)
         */
        db2_env.mp_size = 20 * 1024 * 1024;
 
         */
        db2_env.mp_size = 20 * 1024 * 1024;
 

-       ret = db_appinit(DBDIR, NULL, &db2_env, DB_INIT_MPOOL|DB_INIT_LOCK);
+       ret = db_appinit(config.db_dir, NULL,
+                       &db2_env, DB_INIT_MPOOL|DB_INIT_LOCK);

        if (!ret) {
                db2_keydbfiles = (DB **) malloc(sizeof (DB *) * db2_numdb);
                memset(&keydbinfo, 0, sizeof(keydbinfo));
        if (!ret) {
                db2_keydbfiles = (DB **) malloc(sizeof (DB *) * db2_numdb);
                memset(&keydbinfo, 0, sizeof(keydbinfo));


@@ -154,10 +122,33 @@ void cleanupdb(void)
        db_appexit(&db2_env);
 }
 
        db_appexit(&db2_env);
 }
 

+/**
+ *     starttrans - Start a transaction.
+ *
+ *     Start a transaction. Intended to be used if we're about to perform many
+ *     operations on the database to help speed it all up, or if we want
+ *     something to only succeed if all relevant operations are successful.
+ */
+bool starttrans(void)
+{
+       return true;
+}
+
+/**
+ *     endtrans - End a transaction.
+ *
+ *     Ends a transaction.
+ */
+void endtrans(void)
+{
+       return;
+}
+

 /**
  *     fetch_key - Given a keyid fetch the key from storage.
  *     @keyid: The keyid to fetch.
  *     @publickey: A pointer to a structure to return the key in.
 /**
  *     fetch_key - Given a keyid fetch the key from storage.
  *     @keyid: The keyid to fetch.
  *     @publickey: A pointer to a structure to return the key in.

+ *     @intrans: If we're already in a transaction.

  *
  *     We use the hex representation of the keyid as the filename to fetch the
  *     key from. The key is stored in the file as a binary OpenPGP stream of
  *
  *     We use the hex representation of the keyid as the filename to fetch the
  *     key from. The key is stored in the file as a binary OpenPGP stream of


@@ -165,13 +156,14 @@ void cleanupdb(void)
  *     in and then parse_keys() to parse the packets into a publickey
  *     structure.
  */
  *     in and then parse_keys() to parse the packets into a publickey
  *     structure.
  */

-int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey)
+int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
+               bool intrans)

 {
        struct openpgp_packet_list *packets = NULL;
        int ret;
        DBT key, data;
        char id[KEYDB_KEYID_BYTES];
 {
        struct openpgp_packet_list *packets = NULL;
        int ret;
        DBT key, data;
        char id[KEYDB_KEYID_BYTES];

-       struct db2_get_ctx fetchbuf;
+       struct buffer_ctx fetchbuf;

 
        memset(&key, 0, sizeof(key));
        memset(&data, 0, sizeof(data));
 
        memset(&key, 0, sizeof(key));
        memset(&data, 0, sizeof(data));


@@ -186,27 +178,41 @@ int fetch_key(uint64_t keyid, struct openpgp_publickey **publickey)
 
        ret = (*(keydb(&key)->get))(keydb(&key), NULL, &key, &data, 0);
        if (ret == 0) {
 
        ret = (*(keydb(&key)->get))(keydb(&key), NULL, &key, &data, 0);
        if (ret == 0) {

-               //do stuff with data.

                fetchbuf.buffer = data.data;
                fetchbuf.offset = 0;
                fetchbuf.size = data.size;
                fetchbuf.buffer = data.data;
                fetchbuf.offset = 0;
                fetchbuf.size = data.size;

-               read_openpgp_stream(keydb_fetchchar, &fetchbuf, &packets);
+               read_openpgp_stream(buffer_fetchchar, &fetchbuf, &packets);

                parse_keys(packets, publickey);
        }
 
        return (!ret);
 }
 
                parse_keys(packets, publickey);
        }
 
        return (!ret);
 }
 

+/**
+ *     fetch_key_text - Trys to find the keys that contain the supplied text.
+ *     @search: The text to search for.
+ *     @publickey: A pointer to a structure to return the key in.
+ *
+ *     This function searches for the supplied text and returns the keys that
+ *     contain it.
+ */
+int fetch_key_text(const char *search, struct openpgp_publickey **publickey)
+{
+       return 0;
+}
+

 /**
  *     store_key - Takes a key and stores it.
  *     @publickey: A pointer to the public key to store.
 /**
  *     store_key - Takes a key and stores it.
  *     @publickey: A pointer to the public key to store.

+ *     @intrans: If we're already in a transaction.
+ *     @update: If true the key exists and should be updated.

  *
  *     Again we just use the hex representation of the keyid as the filename
  *     to store the key to. We flatten the public key to a list of OpenPGP
  *     packets and then use write_openpgp_stream() to write the stream out to
  *     the file.
  */
  *
  *     Again we just use the hex representation of the keyid as the filename
  *     to store the key to. We flatten the public key to a list of OpenPGP
  *     packets and then use write_openpgp_stream() to write the stream out to
  *     the file.
  */

-int store_key(struct openpgp_publickey *publickey)
+int store_key(struct openpgp_publickey *publickey, bool intrans, bool update)

 {
        return 0;
 }
 {
        return 0;
 }


@@ -214,11 +220,12 @@ int store_key(struct openpgp_publickey *publickey)
 /**
  *     delete_key - Given a keyid delete the key from storage.
  *     @keyid: The keyid to delete.
 /**
  *     delete_key - Given a keyid delete the key from storage.
  *     @keyid: The keyid to delete.

+ *     @intrans: If we're already in a transaction.

  *
  *     This function deletes a public key from whatever storage mechanism we
  *     are using. Returns 0 if the key existed.
  */
  *
  *     This function deletes a public key from whatever storage mechanism we
  *     are using. Returns 0 if the key existed.
  */

-int delete_key(uint64_t keyid)
+int delete_key(uint64_t keyid, bool intrans)

 {
        return (1);
 }
 {
        return (1);
 }


@@ -226,4 +233,7 @@ int delete_key(uint64_t keyid)
 /*
  * Include the basic keydb routines.
  */
 /*
  * Include the basic keydb routines.
  */

+#define NEED_KEYID2UID 1
+#define NEED_GETKEYSIGS 1
+#define NEED_GETFULLKEYID 1

 #include "keydb.c"
 #include "keydb.c"