* GNUnet URIs are of the general form "gnunet://MODULE/IDENTIFIER".
* The specific structure of "IDENTIFIER" depends on the module and
* maybe differenciated into additional subcategories if applicable.
- * This module only deals with ecrs identifiers (MODULE = "ecrs").
+ * This module only deals with fs identifiers (MODULE = "fs").
* <p>
*
- * This module only parses URIs for the AFS module. The ECRS URIs fall
+ * This module only parses URIs for the AFS module. The FS URIs fall
* into four categories, "chk", "sks", "ksk" and "loc". The first three
* categories were named in analogy (!) to Freenet, but they do NOT
* work in exactly the same way. They are very similar from the user's
* <ul><li>
*
* First, there are URIs that identify a file. They have the format
- * "gnunet://ecrs/chk/HEX1.HEX2.SIZE". These URIs can be used to
+ * "gnunet://fs/chk/HEX1.HEX2.SIZE". These URIs can be used to
* download the file. The description, filename, mime-type and other
* meta-data is NOT part of the file-URI since a URI uniquely
* identifies a resource (and the contents of the file would be the
* </li><li>
*
* The second category identifies entries in a namespace. The format
- * is "gnunet://ecrs/sks/NAMESPACE/IDENTIFIER" where the namespace
+ * is "gnunet://fs/sks/NAMESPACE/IDENTIFIER" where the namespace
* should be given in HEX. Applications may allow using a nickname
* for the namespace if the nickname is not ambiguous. The identifier
* can be either an ASCII sequence or a HEX-encoding. If the
* </li> <li>
*
* The third category identifies ordinary searches. The format is
- * "gnunet://ecrs/ksk/KEYWORD[+KEYWORD]*". Using the "+" syntax
+ * "gnunet://fs/ksk/KEYWORD[+KEYWORD]*". Using the "+" syntax
* it is possible to encode searches with the boolean "AND" operator.
* "+" is used since it indicates a commutative 'and' operation and
* is unlikely to be used in a keyword by itself.
* </li><li>
*
* The last category identifies a datum on a specific machine. The
- * format is "gnunet://ecrs/loc/HEX1.HEX2.SIZE.PEER.SIG.EXPTIME". PEER is
+ * format is "gnunet://fs/loc/HEX1.HEX2.SIZE.PEER.SIG.EXPTIME". PEER is
* the BinName of the public key of the peer storing the datum. The
* signature (SIG) certifies that this peer has this content.
* HEX1, HEX2 and SIZE correspond to a 'chk' URI.
*/
#include "platform.h"
#include "gnunet_fs_service.h"
+#include "gnunet_signatures.h"
#include "fs.h"
}
-
-
/**
* Given a keyword with %-encoding (and possibly quotes to protect
* spaces), return a copy of the keyword without %-encoding and
if (1 != sscanf (&out[rpos + 1], "%2X", &hx))
{
GNUNET_free (out);
+ *emsg = GNUNET_strdup (_("`%' must be followed by HEX number"));
return NULL;
}
rpos += 3;
pos = strlen (GNUNET_FS_URI_PREFIX GNUNET_FS_URI_KSK_INFIX);
if ( (slen <= pos) ||
(0 != strncmp (s, GNUNET_FS_URI_PREFIX GNUNET_FS_URI_KSK_INFIX,
- pos) ) ||
- (s[slen - 1] == '+') ||
+ pos) ) )
+ return NULL; /* not KSK URI */
+ if ( (s[slen - 1] == '+') ||
(s[pos] == '+') )
- return NULL; /* no keywords / malformed */
-
+ {
+ *emsg = GNUNET_strdup (_("Malformed KSK URI (must not begin or end with `+')"));
+ return NULL;
+ }
max = 1;
saw_quote = 0;
for (i = pos; i < slen; i++)
{
max++;
if (s[i - 1] == '+')
- return NULL; /* "++" not allowed */
+ {
+ *emsg = GNUNET_strdup (_("`++' not allowed in KSK URI"));
+ return NULL;
+ }
}
}
if (saw_quote == 1)
- return NULL; /* quotes not balanced */
+ {
+ *emsg = GNUNET_strdup (_("Quotes not balanced in KSK URI"));
+ return NULL;
+ }
iret = max;
dup = GNUNET_strdup (s);
keywords = GNUNET_malloc (max * sizeof (char *));
{
keywords[--max] = percent_decode_keyword (&dup[i + 1], emsg);
if (NULL == keywords[max])
- goto CLEANUP;
+ goto CLEANUP;
dup[i] = '\0';
}
}
pos = strlen (GNUNET_FS_URI_PREFIX GNUNET_FS_URI_SKS_INFIX);
if ( (slen <= pos) ||
(0 != strncmp (s, GNUNET_FS_URI_PREFIX GNUNET_FS_URI_SKS_INFIX,
- pos) ) ||
- (slen < pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) + 1) ||
+ pos) ) )
+ return NULL; /* not an SKS URI */
+ if ( (slen < pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) + 1) ||
(s[pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) - 1] != '/') )
- return NULL;
+ {
+ *emsg = GNUNET_strdup (_("Malformed SKS URI"));
+ return NULL;
+ }
memcpy (enc, &s[pos], sizeof(struct GNUNET_CRYPTO_HashAsciiEncoded));
enc[sizeof(struct GNUNET_CRYPTO_HashAsciiEncoded)-1] = '\0';
if (GNUNET_OK != GNUNET_CRYPTO_hash_from_string (enc, &namespace))
- return NULL;
+ {
+ *emsg = GNUNET_strdup (_("Malformed SKS URI"));
+ return NULL;
+ }
identifier = GNUNET_strdup (&s[pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded)]);
ret = GNUNET_malloc (sizeof(struct GNUNET_FS_Uri));
ret->type = sks;
struct GNUNET_FS_Uri *ret;
struct FileIdentifier fi;
unsigned int pos;
+ unsigned long long flen;
size_t slen;
char h1[sizeof(struct GNUNET_CRYPTO_HashAsciiEncoded)];
char h2[sizeof(struct GNUNET_CRYPTO_HashAsciiEncoded)];
pos = strlen (GNUNET_FS_URI_PREFIX GNUNET_FS_URI_CHK_INFIX);
if ( (slen < pos + 2 * sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) + 1) ||
(0 != strncmp (s, GNUNET_FS_URI_PREFIX GNUNET_FS_URI_CHK_INFIX,
- pos) ) ||
- (s[pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) - 1] != '.') ||
+ pos) ) )
+ return NULL; /* not a CHK URI */
+ if ( (s[pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) - 1] != '.') ||
(s[pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) * 2 - 1] != '.') )
- return NULL;
-
+ {
+ *emsg = GNUNET_strdup (_("Malformed CHK URI"));
+ return NULL;
+ }
memcpy (h1,
&s[pos],
sizeof(struct GNUNET_CRYPTO_HashAsciiEncoded));
&fi.chk.query)) ||
(1 != SSCANF (&s[pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) * 2],
"%llu",
- &fi.file_length)))
- return NULL;
- fi.file_length = GNUNET_htonll (fi.file_length);
-
+ &flen)) )
+ {
+ *emsg = GNUNET_strdup (_("Malformed CHK URI"));
+ return NULL;
+ }
+ fi.file_length = GNUNET_htonll (flen);
ret = GNUNET_malloc (sizeof(struct GNUNET_FS_Uri));
ret->type = chk;
ret->data.chk = fi;
}
+/**
+ * Convert a character back to the binary value
+ * that it represents (given base64-encoding).
+ *
+ * @param a character to convert
+ * @return offset in the "tbl" array
+ */
+static unsigned int
+c2v (unsigned char a)
+{
+ if ((a >= '0') && (a <= '9'))
+ return a - '0';
+ if ((a >= 'A') && (a <= 'Z'))
+ return (a - 'A' + 10);
+ if ((a >= 'a') && (a <= 'z'))
+ return (a - 'a' + 36);
+ if (a == '_')
+ return 62;
+ if (a == '=')
+ return 63;
+ return -1;
+}
+
+
+/**
+ * Convert string back to binary data.
+ *
+ * @param input '\0'-terminated string
+ * @param data where to write binary data
+ * @param size how much data should be converted
+ * @return number of characters processed from input,
+ * -1 on error
+ */
+static int
+enc2bin (const char *input, void *data, size_t size)
+{
+ size_t len;
+ size_t pos;
+ unsigned int bits;
+ unsigned int hbits;
+
+ len = size * 8 / 6;
+ if (((size * 8) % 6) != 0)
+ len++;
+ if (strlen (input) < len)
+ return -1; /* error! */
+ bits = 0;
+ hbits = 0;
+ len = 0;
+ for (pos = 0; pos < size; pos++)
+ {
+ while (hbits < 8)
+ {
+ bits |= (c2v (input[len++]) << hbits);
+ hbits += 6;
+ }
+ (((unsigned char *) data)[pos]) = (unsigned char) bits;
+ bits >>= 8;
+ hbits -= 8;
+ }
+ return len;
+}
+
+
+/**
+ * Structure that defines how the
+ * contents of a location URI must be
+ * assembled in memory to create or
+ * verify the signature of a location
+ * URI.
+ */
+struct LocUriAssembly
+{
+ struct GNUNET_CRYPTO_RsaSignaturePurpose purpose;
+
+ struct GNUNET_TIME_AbsoluteNBO exptime;
+
+ struct FileIdentifier fi;
+
+ struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded peer;
+
+};
+
+
/**
* Parse a LOC URI.
* Also verifies validity of the location URI.
static struct GNUNET_FS_Uri *
uri_loc_parse (const char *s, char **emsg)
{
- struct GNUNET_FS_Uri *ret;
+ struct GNUNET_FS_Uri *uri;
char h1[sizeof(struct GNUNET_CRYPTO_HashAsciiEncoded)];
char h2[sizeof(struct GNUNET_CRYPTO_HashAsciiEncoded)];
unsigned int pos;
unsigned int npos;
unsigned long long exptime;
+ unsigned long long flen;
+ struct GNUNET_TIME_Absolute et;
+ struct GNUNET_CRYPTO_RsaSignature sig;
+ struct LocUriAssembly ass;
int ret;
size_t slen;
- char *addr;
GNUNET_assert (s != NULL);
slen = strlen (s);
pos = strlen (GNUNET_FS_URI_PREFIX GNUNET_FS_URI_LOC_INFIX);
if ( (slen < pos + 2 * sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) + 1) ||
(0 != strncmp (s, GNUNET_FS_URI_PREFIX GNUNET_FS_URI_LOC_INFIX,
- pos) ) ||
- (s[pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) - 1] != '.') ||
+ pos) ) )
+ return NULL; /* not an SKS URI */
+ if ( (s[pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) - 1] != '.') ||
(s[pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) * 2 - 1] != '.') )
- return NULL;
-
+ {
+ *emsg = GNUNET_strdup (_("SKS URI malformed"));
+ return NULL;
+ }
memcpy (h1,
&s[pos],
sizeof(struct GNUNET_CRYPTO_HashAsciiEncoded));
h2[sizeof(struct GNUNET_CRYPTO_HashAsciiEncoded)-1] = '\0';
if ((GNUNET_OK != GNUNET_CRYPTO_hash_from_string (h1,
- &fi.chk.key)) ||
+ &ass.fi.chk.key)) ||
(GNUNET_OK != GNUNET_CRYPTO_hash_from_string (h2,
- &fi.chk.query))
+ &ass.fi.chk.query)) ||
(1 != SSCANF (&s[pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) * 2],
"%llu",
- &fi.file_length)) )
- return NULL;
- fi.file_length = GNUNET_htonll (fi.file_length);
+ &flen)) )
+ {
+ *emsg = GNUNET_strdup (_("SKS URI malformed"));
+ return NULL;
+ }
+ ass.fi.file_length = GNUNET_htonll (flen);
npos = pos + sizeof (struct GNUNET_CRYPTO_HashAsciiEncoded) * 2;
while ((s[npos] != '\0') && (s[npos] != '.'))
npos++;
if (s[npos] == '\0')
- goto ERR;
+ {
+ *emsg = GNUNET_strdup (_("SKS URI malformed"));
+ goto ERR;
+ }
+ npos++;
ret = enc2bin (&s[npos],
- &loc->peer,
- sizeof (GNUNET_RSA_PublicKey));
+ &ass.peer,
+ sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded));
if (ret == -1)
- goto ERR;
+ {
+ *emsg = GNUNET_strdup (_("SKS URI malformed (could not decode public key)"));
+ goto ERR;
+ }
npos += ret;
- if (dup[npos++] != '.')
- goto ERR;
+ if (s[npos++] != '.')
+ {
+ *emsg = GNUNET_strdup (_("SKS URI malformed (could not find signature)"));
+ goto ERR;
+ }
ret = enc2bin (&s[npos],
- &loc->contentSignature,
+ &sig,
sizeof (struct GNUNET_CRYPTO_RsaSignature));
if (ret == -1)
- goto ERR;
- npos += ret;
- if (dup[npos++] != '.')
- goto ERR;
- if (1 != SSCANF (&dup[npos], "%llu", &exptime))
- goto ERR;
- // FIXME: do something to exptime...
- /* Finally: verify sigs! */
- if (GNUNET_OK != GNUNET_RSA_verify (&loc->fi,
- sizeof (struct FileIdentifier) +
- sizeof (GNUNET_PeerIdentity) +
- sizeof (GNUNET_Int32Time),
- &loc->contentSignature,
- &loc->peer))
- goto ERR;
-
- ret = GNUNET_malloc (sizeof(struct GNUNET_FS_Uri));
- ret->type = loc;
- ret->data.loc.chk = fi;
- ret->data.loc.xx = yy;
+ {
+ *emsg = GNUNET_strdup (_("SKS URI malformed (could not decode signature)"));
+ goto ERR;
+ }
+ npos += ret;
+ if (s[npos++] != '.')
+ {
+ *emsg = GNUNET_strdup (_("SKS URI malformed"));
+ goto ERR;
+ }
+ if (1 != SSCANF (&s[npos], "%llu", &exptime))
+ {
+ *emsg = GNUNET_strdup (_("SKS URI malformed (could not parse expiration time)"));
+ goto ERR;
+ }
+ ass.purpose.size = htonl(sizeof(struct LocUriAssembly));
+ ass.purpose.purpose = htonl(GNUNET_SIGNATURE_PURPOSE_PEER_PLACEMENT);
+ et.value = exptime;
+ ass.exptime = GNUNET_TIME_absolute_hton (et);
+ if (GNUNET_OK !=
+ GNUNET_CRYPTO_rsa_verify (GNUNET_SIGNATURE_PURPOSE_PEER_PLACEMENT,
+ &ass.purpose,
+ &sig,
+ &ass.peer))
+ {
+ *emsg = GNUNET_strdup (_("SKS URI malformed (signature failed validation)"));
+ goto ERR;
+ }
+ uri = GNUNET_malloc (sizeof(struct GNUNET_FS_Uri));
+ uri->type = loc;
+ uri->data.loc.fi = ass.fi;
+ uri->data.loc.peer = ass.peer;
+ uri->data.loc.expirationTime = et;
+ uri->data.loc.contentSignature = sig;
- return ret;
+ return uri;
ERR:
- GNUNET_free_non_null (addr);
return NULL;
}
char **emsg)
{
struct GNUNET_FS_Uri *ret;
+ char *msg;
+ if (NULL == emsg)
+ emsg = &msg;
+ *emsg = NULL;
if ( (NULL != (ret = uri_chk_parse (uri, emsg))) ||
(NULL != (ret = uri_ksk_parse (uri, emsg))) ||
(NULL != (ret = uri_sks_parse (uri, emsg))) ||
(NULL != (ret = uri_loc_parse (uri, emsg))) )
return ret;
+ if (NULL == *emsg)
+ *emsg = GNUNET_strdup (_("Unrecognized URI type"));
+ if (emsg == &msg)
+ GNUNET_free (msg);
return NULL;
}
struct GNUNET_FS_Uri *
GNUNET_FS_uri_loc_create (const struct GNUNET_FS_Uri *baseUri,
struct GNUNET_CONFIGURATION_Handle *cfg,
- struct GNUNET_TIME_Absolute expiration_time);
+ struct GNUNET_TIME_Absolute expiration_time)
+{
+ struct GNUNET_FS_Uri *uri;
+ struct GNUNET_CRYPTO_RsaPrivateKey *my_private_key;
+ struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded my_public_key;
+ char *keyfile;
+ struct LocUriAssembly ass;
+
+ if (baseUri->type != chk)
+ return NULL;
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_filename (cfg,
+ "GNUNETD",
+ "HOSTKEY", &keyfile))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _
+ ("Lacking key configuration settings.\n"));
+ return NULL;
+ }
+ my_private_key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
+ if (my_private_key == NULL)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Could not access hostkey file `%s'.\n"),
+ keyfile);
+ GNUNET_free (keyfile);
+ return NULL;
+ }
+ GNUNET_free (keyfile);
+ GNUNET_CRYPTO_rsa_key_get_public (my_private_key, &my_public_key);
+ ass.purpose.size = htonl(sizeof(struct LocUriAssembly));
+ ass.purpose.purpose = htonl(GNUNET_SIGNATURE_PURPOSE_PEER_PLACEMENT);
+ ass.exptime = GNUNET_TIME_absolute_hton (expiration_time);
+ ass.fi = baseUri->data.chk;
+ ass.peer = my_public_key;
+ uri = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
+ uri->type = loc;
+ uri->data.loc.fi = baseUri->data.chk;
+ uri->data.loc.expirationTime = expiration_time;
+ uri->data.loc.peer = my_public_key;
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CRYPTO_rsa_sign (my_private_key,
+ &ass.purpose,
+ &uri->data.loc.contentSignature));
+ GNUNET_CRYPTO_rsa_key_free (my_private_key);
+ return uri;
+}
+
+
+/**
+ * Canonicalize a keyword.
+ *
+ * @param in input string (the keyword)
+ * @return canonicalized keyword
+ */
+static char *
+canonicalize_keyword (const char *in)
+{
+ char *ret;
+ char *wpos;
+ const char *rpos;
+
+ ret = GNUNET_strdup (in);
+ wpos = ret;
+ rpos = in;
+ while ('\0' != *rpos)
+ {
+ switch (tolower(*rpos))
+ {
+ case 'a':
+ case 'e':
+ case 'i':
+ case 'o':
+ case 'u':
+ case ' ':
+ case '\t':
+ case '\n':
+ case '\r':
+ /* skip characters listed above */
+ rpos++;
+ break;
+ case 'b':
+ case 'c':
+ case 'd':
+ case 'f':
+ case 'g':
+ case 'h':
+ case 'j':
+ case 'k':
+ case 'l':
+ case 'm':
+ case 'n':
+ case 'p':
+ case 'r':
+ case 's':
+ case 't':
+ case 'v':
+ case 'w':
+ case 'x':
+ case 'y':
+ case 'z':
+ /* convert characters listed above to lower case */
+ *wpos = tolower(*rpos);
+ wpos++;
+ case '!':
+ case '.':
+ case '?':
+ case '-':
+ /* keep characters listed above without changes */
+ *wpos = *rpos;
+ wpos++;
+ default:
+ /* replace characters listed above with '_' */
+ *wpos = '_';
+ wpos++;
+ }
+ rpos++;
+ }
+ return ret;
+}
/**
struct GNUNET_FS_Uri *
GNUNET_FS_uri_ksk_canonicalize (const struct GNUNET_FS_Uri *uri)
{
- /* FIXME: not implemented */
- return NULL;
+ struct GNUNET_FS_Uri *ret;
+ unsigned int kc;
+ unsigned int i;
+ char **kl;
+
+ kc = uri->data.ksk.keywordCount;
+ kl = GNUNET_malloc (kc*sizeof(char*));
+ for (i=0;i<kc;i++)
+ kl[i] = canonicalize_keyword (uri->data.ksk.keywords[i]);
+ ret = GNUNET_malloc (sizeof(struct GNUNET_FS_Uri));
+ ret->type = ksk;
+ ret->data.ksk.keywordCount = kc;
+ ret->data.ksk.keywords = kl;
+ return ret;
}
GNUNET_FS_uri_ksk_merge (const struct GNUNET_FS_Uri *u1,
const struct GNUNET_FS_Uri *u2)
{
- /* FIXME */
- return NULL;
+ struct GNUNET_FS_Uri *ret;
+ unsigned int kc;
+ unsigned int i;
+ unsigned int j;
+ int found;
+ const char *kp;
+ char **kl;
+
+ if ( (u1->type != ksk) ||
+ (u2->type != ksk) )
+ {
+ GNUNET_break (0);
+ return NULL;
+ }
+ kc = u1->data.ksk.keywordCount;
+ kl = GNUNET_malloc ((kc+u2->data.ksk.keywordCount)*sizeof(char*));
+ for (i=0;i<u1->data.ksk.keywordCount;i++)
+ kl[i] = GNUNET_strdup (u1->data.ksk.keywords[i]);
+ for (i=0;i<u2->data.ksk.keywordCount;i++)
+ {
+ kp = u2->data.ksk.keywords[i];
+ found = 0;
+ for (j=0;j<u1->data.ksk.keywordCount;j++)
+ if (0 == strcmp(kp + 1,
+ kl[j]+1))
+ {
+ found = 1;
+ if (kp[0] == '+')
+ kl[j][0] = '+';
+ break;
+ }
+ if (0 == found)
+ kl[kc++] = GNUNET_strdup (kp - 1);
+ }
+ ret = GNUNET_malloc (sizeof(struct GNUNET_FS_Uri));
+ ret->type = ksk;
+ ret->data.ksk.keywordCount = kc;
+ ret->data.ksk.keywords = kl;
+ return ret;
}
* "OR"ed keywords 'foo' and 'bar', not into '"foo bar"'.
*
* @param keywords the keyword string
+ * @param emsg where to store an error message
* @return an FS URI for the given keywords, NULL
* if keywords is not legal (i.e. empty).
*/
struct GNUNET_FS_Uri *
-GNUNET_FS_uri_ksk_create (const char *keywords)
+GNUNET_FS_uri_ksk_create (const char *keywords,
+ char **emsg)
{
- /* FIXME */
- return NULL;
+ char **keywordarr;
+ unsigned int num_Words;
+ int inWord;
+ char *pos;
+ struct GNUNET_FS_Uri *uri;
+ char *searchString;
+ int saw_quote;
+
+ if (keywords == NULL)
+ {
+ GNUNET_break (0);
+ return NULL;
+ }
+ searchString = GNUNET_strdup (keywords);
+ num_Words = 0;
+ inWord = 0;
+ saw_quote = 0;
+ pos = searchString;
+ while ('\0' != *pos)
+ {
+ if ((saw_quote == 0) && (isspace (*pos)))
+ {
+ inWord = 0;
+ }
+ else if (0 == inWord)
+ {
+ inWord = 1;
+ ++num_Words;
+ }
+ if ('"' == *pos)
+ saw_quote = (saw_quote + 1) % 2;
+ pos++;
+ }
+ if (num_Words == 0)
+ {
+ GNUNET_free (searchString);
+ *emsg = GNUNET_strdup (_("No keywords specified!\n"));
+ return NULL;
+ }
+ if (saw_quote != 0)
+ {
+ GNUNET_free (searchString);
+ *emsg = GNUNET_strdup (_("Number of double-quotes not balanced!\n"));
+ return NULL;
+ }
+ keywordarr = GNUNET_malloc (num_Words * sizeof (char *));
+ num_Words = 0;
+ inWord = 0;
+ pos = searchString;
+ while ('\0' != *pos)
+ {
+ if ((saw_quote == 0) && (isspace (*pos)))
+ {
+ inWord = 0;
+ *pos = '\0';
+ }
+ else if (0 == inWord)
+ {
+ keywordarr[num_Words] = pos;
+ inWord = 1;
+ ++num_Words;
+ }
+ if ('"' == *pos)
+ saw_quote = (saw_quote + 1) % 2;
+ pos++;
+ }
+ uri =
+ GNUNET_FS_uri_ksk_create_from_args (num_Words,
+ (const char **) keywordarr);
+ GNUNET_free (keywordarr);
+ GNUNET_free (searchString);
+ return uri;
}
GNUNET_FS_uri_ksk_create_from_args (unsigned int argc,
const char **argv)
{
- /* FIXME */
- return NULL;
+ unsigned int i;
+ struct GNUNET_FS_Uri *uri;
+ const char *keyword;
+ char *val;
+ const char *r;
+ char *w;
+ char *emsg;
+
+ if (argc == 0)
+ return NULL;
+ /* allow URI to be given as one and only keyword and
+ handle accordingly */
+ emsg = NULL;
+ if ( (argc == 1) &&
+ (strlen(argv[0]) > strlen(GNUNET_FS_URI_PREFIX)) &&
+ (0 == strncmp(argv[0], GNUNET_FS_URI_PREFIX, strlen(GNUNET_FS_URI_PREFIX)) ) &&
+ (NULL != (uri = GNUNET_FS_uri_parse(argv[0], &emsg)) ) )
+ return uri;
+ GNUNET_free_non_null (emsg);
+ uri = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
+ uri->type = ksk;
+ uri->data.ksk.keywordCount = argc;
+ uri->data.ksk.keywords = GNUNET_malloc (argc * sizeof (char *));
+ for (i = 0; i < argc; i++)
+ {
+ keyword = argv[i];
+ if (keyword[0] == '+')
+ val = GNUNET_strdup (keyword);
+ else
+ GNUNET_asprintf (&val, " %s", keyword);
+ r = val;
+ w = val;
+ while ('\0' != *r)
+ {
+ if ('"' == *r)
+ r++;
+ else
+ *(w++) = *(r++);
+ }
+ *w = '\0';
+ uri->data.ksk.keywords[i] = val;
+ }
+ return uri;
}
GNUNET_FS_uri_sks_to_string_fancy (struct GNUNET_CONFIGURATION_Handle *cfg,
const struct GNUNET_FS_Uri *uri)
{
- /* FIXME */
- return NULL;
+ char *ret;
+ char *name;
+
+ if (uri->type != sks)
+ return NULL;
+ name = GNUNET_PSEUDONYM_id_to_name (cfg, &uri->data.sks.namespace);
+ if (name == NULL)
+ return GNUNET_FS_uri_to_string (uri);
+ GNUNET_asprintf (&ret,
+ "%s: %s",
+ name,
+ uri->data.sks.identifier);
+ GNUNET_free (name);
+ return ret;
}
* Construct a keyword-URI from meta-data (take all entries
* in the meta-data and construct one large keyword URI
* that lists all keywords that can be found in the meta-data).
- * @deprecated
+ *
+ * @param md metadata to use
+ * @return NULL on error, otherwise a KSK URI
*/
struct GNUNET_FS_Uri *
GNUNET_FS_uri_ksk_create_from_meta_data (const struct GNUNET_CONTAINER_MetaData *md)
/**
* Convert binary data to a string.
*
+ * @param data binary data to convert
+ * @param size number of bytes in data
* @return converted data
*/
static char *
}
-/**
- * Convert a character back to the binary value
- * that it represents (given base64-encoding).
- *
- * @param a character to convert
- * @return offset in the "tbl" array
- */
-static unsigned int
-c2v (unsigned char a)
-{
- if ((a >= '0') && (a <= '9'))
- return a - '0';
- if ((a >= 'A') && (a <= 'Z'))
- return (a - 'A' + 10);
- if ((a >= 'a') && (a <= 'z'))
- return (a - 'a' + 36);
- if (a == '_')
- return 62;
- if (a == '=')
- return 63;
- return -1;
-}
-
-
-/**
- * Convert string back to binary data.
- *
- * @param input '\0'-terminated string
- * @param data where to write binary data
- * @param size how much data should be converted
- * @return number of characters processed from input,
- * -1 on error
- */
-static int
-enc2bin (const char *input, void *data, size_t size)
-{
- size_t len;
- size_t pos;
- unsigned int bits;
- unsigned int hbits;
-
- len = size * 8 / 6;
- if (((size * 8) % 6) != 0)
- len++;
- if (strlen (input) < len)
- return -1; /* error! */
- bits = 0;
- hbits = 0;
- len = 0;
- pos = 0;
- for (pos = 0; pos < size; pos++)
- {
- while (hbits < 8)
- {
- bits |= (c2v (input[len++]) << hbits);
- hbits += 6;
- }
- (((unsigned char *) data)[pos]) = (unsigned char) bits;
- bits >>= 8;
- hbits -= 8;
- }
- return len;
-}
-
-
/**
* Convert a LOC URI to a string.
*
peerSig = bin2enc (&uri->data.loc.contentSignature,
sizeof (struct GNUNET_CRYPTO_RsaSignature));
GNUNET_asprintf (&ret,
- "%s%s%s.%s.%llu.%s.%s.%u", // FIXME: expirationTime 64-bit???
+ "%s%s%s.%s.%llu.%s.%s.%llu",
GNUNET_FS_URI_PREFIX,
GNUNET_FS_URI_LOC_INFIX,
(const char *) &keyhash,
(const char *) &queryhash,
- GNUNET_ntohll (uri->data.loc.fi.file_length),
+ (unsigned long long) GNUNET_ntohll (uri->data.loc.fi.file_length),
peerId,
peerSig,
- uri->data.loc.expirationTime);
+ (unsigned long long) uri->data.loc.expirationTime.value);
GNUNET_free (peerSig);
GNUNET_free (peerId);
return ret;
}
}
-
-#if 0
-
-/**
- * Construct a location URI.
- *
- * @param baseURI content offered by the sender
- * @param sender identity of the peer with the content
- * @param expiration_time how long will the content be offered?
- * @param proto transport protocol to reach the peer
- * @param sas sender address size (for HELLO)
- * @param address sas bytes of address information
- * @param signer function to call for obtaining
- * RSA signatures for "sender".
- * @return the location URI
- */
-struct GNUNET_ECRS_URI *
-GNUNET_ECRS_location_to_uri (const struct GNUNET_ECRS_URI *baseUri,
- const GNUNET_RSA_PublicKey * sender,
- GNUNET_Int32Time expirationTime,
- GNUNET_ECRS_SignFunction signer,
- void *signer_cls)
-{
- struct GNUNET_ECRS_URI *uri;
-
- if (baseUri->type != chk)
- return NULL;
-
- uri = GNUNET_malloc (sizeof (struct GNUNET_ECRS_URI));
- uri->type = loc;
- uri->data.loc.fi = baseUri->data.fi;
- uri->data.loc.peer = *sender;
- uri->data.loc.expirationTime = expirationTime;
- signer (signer_cls,
- sizeof (GNUNET_EC_FileIdentifier) +
- sizeof (GNUNET_PeerIdentity) +
- sizeof (GNUNET_Int32Time),
- &uri->data.loc.fi, &uri->data.loc.contentSignature);
- return uri;
-}
-
-#endif
-
-/* end of uri.c */
+/* end of fs_uri.c */