tdbtool: Add "storehex" command

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Böhme <slow@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Sat Apr 22 09:16:16 CEST 2017 on sn-devel-144

diff --git a/lib/tdb/man/tdbtool.8.xml b/lib/tdb/man/tdbtool.8.xml
index 9a9b95e6a0621dc3c880c154d28c972ea02be401..045cbde73dd7d88c36a77c8ed35d49e69bf17554 100644 (file)
--- a/lib/tdb/man/tdbtool.8.xml
+++ b/lib/tdb/man/tdbtool.8.xml
@@ -159,6 +159,16 @@
                </para></listitem>
                </varlistentry>
 
                </para></listitem>
                </varlistentry>
 

+               <varlistentry>
+               <term><option>storehex</option>
+               <replaceable>KEY</replaceable>
+               <replaceable>DATA</replaceable>
+               </term>
+               <listitem><para>Store (replace) a record in the
+               current database where key and data are in hex format.
+               </para></listitem>
+               </varlistentry>
+

                <varlistentry>
                <term><option>show</option>
                <replaceable>KEY</replaceable>
                <varlistentry>
                <term><option>show</option>
                <replaceable>KEY</replaceable>

diff --git a/lib/tdb/tools/tdbtool.c b/lib/tdb/tools/tdbtool.c
index beb3af18e23051586991bbd101fa6a5d2fa8103d..e3535b93c7c4296a9b4f9d3b9797841f762062cd 100644 (file)
--- a/lib/tdb/tools/tdbtool.c
+++ b/lib/tdb/tools/tdbtool.c
@@ -48,6 +48,7 @@ enum commands {
        CMD_DUMP,
        CMD_INSERT,
        CMD_MOVE,
        CMD_DUMP,
        CMD_INSERT,
        CMD_MOVE,

+       CMD_STOREHEX,

        CMD_STORE,
        CMD_SHOW,
        CMD_KEYS,
        CMD_STORE,
        CMD_SHOW,
        CMD_KEYS,


@@ -83,6 +84,7 @@ COMMAND_TABLE cmd_table[] = {
        {"dump",        CMD_DUMP},
        {"insert",      CMD_INSERT},
        {"move",        CMD_MOVE},
        {"dump",        CMD_DUMP},
        {"insert",      CMD_INSERT},
        {"move",        CMD_MOVE},

+       {"storehex",    CMD_STOREHEX},

        {"store",       CMD_STORE},
        {"show",        CMD_SHOW},
        {"keys",        CMD_KEYS},
        {"store",       CMD_STORE},
        {"show",        CMD_SHOW},
        {"keys",        CMD_KEYS},


@@ -229,6 +231,7 @@ static void help(void)
 "  info                 : print summary info about the database\n"
 "  insert    key  data  : insert a record\n"
 "  move      key  file  : move a record to a destination tdb\n"
 "  info                 : print summary info about the database\n"
 "  insert    key  data  : insert a record\n"
 "  move      key  file  : move a record to a destination tdb\n"

+"  storehex  key  data  : store a record (replace), key/value in hex format\n"

 "  store     key  data  : store a record (replace)\n"
 "  show      key        : show a record by key\n"
 "  delete    key        : delete a record by key\n"
 "  store     key  data  : store a record (replace)\n"
 "  show      key        : show a record by key\n"
 "  delete    key        : delete a record by key\n"


@@ -346,6 +349,86 @@ static void store_tdb(char *keyname, size_t keylen, char* data, size_t datalen)
        }
 }
 
        }
 }
 

+static bool hexchar(char c, uint8_t *v)
+{
+       if ((c >= '0') && (c <= '9')) {
+               *v = (c - '0');
+               return true;
+       }
+       if ((c >= 'A') && (c <= 'F')) {
+               *v = (c - 'A' + 10);
+               return true;
+       }
+       if ((c >= 'a') && (c <= 'f')) {
+               *v = (c - 'a' + 10);
+               return true;
+       }
+       return false;
+}
+
+static bool parse_hex(const char *src, size_t srclen, uint8_t *dst)
+{
+       size_t i=0;
+
+       if ((srclen % 2) != 0) {
+               return false;
+       }
+
+       while (i<srclen) {
+               bool ok;
+               uint8_t hi,lo;
+
+               ok = (hexchar(src[i++], &hi) && hexchar(src[i++], &lo));
+               if (!ok) {
+                       return false;
+               }
+               *dst = (hi<<4)|lo;
+               dst += 1;
+       }
+
+       return true;
+}
+
+static void store_hex_tdb(char *keystr, size_t keylen,
+                         char *datastr, size_t datalen)
+{
+       if ((keystr == NULL) || (keylen == 0)) {
+               terror("need key");
+               return;
+       }
+       if ((datastr == NULL) || (datalen == 0)) {
+               terror("need data");
+               return;
+       }
+
+       {
+               uint8_t keybuf[keylen/2];
+               TDB_DATA key = { .dptr = keybuf, .dsize = sizeof(keybuf) };
+               uint8_t databuf[datalen/2];
+               TDB_DATA data = { .dptr = databuf, .dsize = sizeof(databuf) };
+               bool ok;
+
+               ok = parse_hex(keystr, keylen, keybuf);
+               if (!ok) {
+                       terror("need hex key");
+                       return;
+               }
+               ok = parse_hex(datastr, datalen, databuf);
+               if (!ok) {
+                       terror("need hex data");
+                       return;
+               }
+
+               printf("storing key/data:\n");
+               print_data((char *)key.dptr, key.dsize);
+               print_data((char *)data.dptr, data.dsize);
+
+               if (tdb_store(tdb, key, data, TDB_REPLACE) != 0) {
+                       terror("store failed");
+               }
+       }
+}
+

 static void show_tdb(char *keyname, size_t keylen)
 {
        TDB_DATA key, dbuf;
 static void show_tdb(char *keyname, size_t keylen)
 {
        TDB_DATA key, dbuf;


@@ -693,6 +776,10 @@ static int do_command(void)
                        bIterate = 0;
                        store_tdb(arg1,arg1len,arg2,arg2len);
                        return 0;
                        bIterate = 0;
                        store_tdb(arg1,arg1len,arg2,arg2len);
                        return 0;

+               case CMD_STOREHEX:
+                       bIterate = 0;
+                       store_hex_tdb(arg1,arg1len,arg2,arg2len);
+                       return 0;

                case CMD_SHOW:
                        bIterate = 0;
                        show_tdb(arg1, arg1len);
                case CMD_SHOW:
                        bIterate = 0;
                        show_tdb(arg1, arg1len);