refactor anchor_string_to_data and anchor_data_to_string in the plugins

5 files changed, 111 insertions, 129 deletions

diff --git a/src/escrow/escrow_plugin_helper.c b/src/escrow/escrow_plugin_helper.c
index 36acae049..154195e7e 100644
--- a/src/escrow/escrow_plugin_helper.c
+++ b/src/escrow/escrow_plugin_helper.c
@@ -358,4 +358,78 @@ ESCROW_get_escrow_status (struct GNUNET_ESCROW_Handle *h,
 }
 
 
+/**
+ * Deserialize an escrow anchor string into a GNUNET_ESCROW_Anchor struct
+ * 
+ * @param anchorString the encoded escrow anchor string
+ * @param method the escrow plugin calling this function
+ * 
+ * @return the deserialized data packed into a GNUNET_ESCROW_Anchor struct,
+ *         NULL if we failed to parse the string
+ */
+struct GNUNET_ESCROW_Anchor *
+ESCROW_anchor_string_to_data (char *anchorString,
+                              enum GNUNET_ESCROW_Key_Escrow_Method method)
+{
+  struct GNUNET_ESCROW_Anchor *anchor;
+  uint32_t data_size;
+  char *anchorStringCopy, *ptr, *egoNameCopy;
+  char delimiter[] = ":";
+  
+  anchorStringCopy = GNUNET_strdup (anchorString);
+
+  // split the string at the first occurrence of the delimiter
+  ptr = strtok (anchorStringCopy, delimiter);
+  egoNameCopy = GNUNET_strdup (ptr);
+  ptr = strtok (NULL, delimiter);
+
+  if (NULL == ptr)
+  {
+    // delimiter was not found
+    GNUNET_free (egoNameCopy);
+    GNUNET_free (anchorStringCopy);
+    return NULL;
+  }
+
+  data_size = strlen (ptr) + 1;
+  anchor = GNUNET_malloc (sizeof (struct GNUNET_ESCROW_Anchor) + data_size);
+  anchor->size = data_size;
+  anchor->egoName = egoNameCopy;
+  anchor->method = method;
+  
+  // TODO: deserialize?
+  GNUNET_memcpy (&anchor[1], ptr, data_size);
+
+  GNUNET_free (anchorStringCopy);
+
+  return anchor;
+}
+
+
+/**
+ * Serialize an escrow anchor struct into a string
+ * 
+ * @param escrowAnchor the escrow anchor struct
+ * @param method the escrow plugin calling this function
+ * 
+ * @return the encoded escrow anchor string
+ */
+char *
+ESCROW_anchor_data_to_string (struct GNUNET_ESCROW_Anchor *escrowAnchor,
+                              enum GNUNET_ESCROW_Key_Escrow_Method method)
+{
+  char *anchorString;
+  size_t egoNameSize;
+
+  egoNameSize = strlen (escrowAnchor->egoName);
+
+  anchorString = GNUNET_malloc (egoNameSize + 1 + escrowAnchor->size);
+  GNUNET_memcpy (anchorString, escrowAnchor->egoName, egoNameSize);
+  anchorString[egoNameSize] = ':';
+  GNUNET_memcpy (anchorString + egoNameSize + 1, &escrowAnchor[1], escrowAnchor->size);
+
+  return anchorString;
+}
+
+
 /* end of escrow_plugin.c */
diff --git a/src/escrow/escrow_plugin_helper.h b/src/escrow/escrow_plugin_helper.h
index f2a54eb6b..dd03522fe 100644
--- a/src/escrow/escrow_plugin_helper.h
+++ b/src/escrow/escrow_plugin_helper.h
@@ -106,3 +106,28 @@ ESCROW_update_escrow_status (struct GNUNET_ESCROW_Handle *h,
 struct GNUNET_ESCROW_Status *
 ESCROW_get_escrow_status (struct GNUNET_ESCROW_Handle *h,
                           struct GNUNET_IDENTITY_Ego *ego);
+
+/**
+ * Deserialize an escrow anchor string into a GNUNET_ESCROW_Anchor struct
+ * 
+ * @param anchorString the encoded escrow anchor string
+ * @param method the escrow plugin calling this function
+ * 
+ * @return the deserialized data packed into a GNUNET_ESCROW_Anchor struct,
+ *         NULL if we failed to parse the string
+ */
+struct GNUNET_ESCROW_Anchor *
+ESCROW_anchor_string_to_data (char *anchorString,
+                              enum GNUNET_ESCROW_Key_Escrow_Method method);
+
+/**
+ * Serialize an escrow anchor struct into a string
+ * 
+ * @param escrowAnchor the escrow anchor struct
+ * @param method the escrow plugin calling this function
+ * 
+ * @return the encoded escrow anchor string
+ */
+char *
+ESCROW_anchor_data_to_string (struct GNUNET_ESCROW_Anchor *escrowAnchor,
+                              enum GNUNET_ESCROW_Key_Escrow_Method method);
diff --git a/src/escrow/plugin_escrow_anastasis.c b/src/escrow/plugin_escrow_anastasis.c
index b3029f885..f4ab4dcbe 100644
--- a/src/escrow/plugin_escrow_anastasis.c
+++ b/src/escrow/plugin_escrow_anastasis.c
@@ -164,38 +164,8 @@ struct GNUNET_ESCROW_Anchor *
 anastasis_anchor_string_to_data (struct GNUNET_ESCROW_Handle *h,
                                  char *anchorString)
 {
-  struct GNUNET_ESCROW_Anchor *anchor;
-  uint32_t data_size;
-  char *anchorStringCopy, *ptr, *egoNameCopy;
-  char delimiter[] = ":";
-  
-  anchorStringCopy = GNUNET_strdup (anchorString);
-
-  // split the string at the first occurrence of the delimiter
-  ptr = strtok (anchorStringCopy, delimiter);
-  egoNameCopy = GNUNET_strdup (ptr);
-  ptr = strtok (NULL, delimiter);
-
-  if (NULL == ptr)
-  {
-    // delimiter was not found
-    GNUNET_free (egoNameCopy);
-    GNUNET_free (anchorStringCopy);
-    return NULL;
-  }
-
-  data_size = strlen (ptr) + 1;
-  anchor = GNUNET_malloc (sizeof (struct GNUNET_ESCROW_Anchor) + data_size);
-  anchor->size = data_size;
-  anchor->egoName = egoNameCopy;
-  anchor->method = GNUNET_ESCROW_KEY_ANASTASIS;
-  
-  // TODO: deserialize?
-  GNUNET_memcpy (&anchor[1], ptr, data_size);
-
-  GNUNET_free (anchorStringCopy);
-
-  return anchor;
+  return ESCROW_anchor_string_to_data (anchorString,
+                                       GNUNET_ESCROW_KEY_ANASTASIS);
 }
 
 
@@ -211,17 +181,8 @@ char *
 anastasis_anchor_data_to_string (struct GNUNET_ESCROW_Handle *h,
                                  struct GNUNET_ESCROW_Anchor *escrowAnchor)
 {
-  char *anchorString;
-  size_t egoNameSize;
-
-  egoNameSize = strlen (escrowAnchor->egoName);
-
-  anchorString = GNUNET_malloc (egoNameSize + 1 + escrowAnchor->size);
-  GNUNET_memcpy (anchorString, escrowAnchor->egoName, egoNameSize);
-  anchorString[egoNameSize] = ':';
-  GNUNET_memcpy (anchorString + egoNameSize + 1, &escrowAnchor[1], escrowAnchor->size);
-
-  return anchorString;
+  return ESCROW_anchor_data_to_string (escrowAnchor,
+                                       GNUNET_ESCROW_KEY_ANASTASIS);
 }
 
 
diff --git a/src/escrow/plugin_escrow_gns.c b/src/escrow/plugin_escrow_gns.c
index 94ce175c5..121fdc4af 100644
--- a/src/escrow/plugin_escrow_gns.c
+++ b/src/escrow/plugin_escrow_gns.c
@@ -1668,38 +1668,8 @@ struct GNUNET_ESCROW_Anchor *
 gns_anchor_string_to_data (struct GNUNET_ESCROW_Handle *h,
                            char *anchorString)
 {
-  struct GNUNET_ESCROW_Anchor *anchor;
-  uint32_t data_size;
-  char *anchorStringCopy, *ptr, *egoNameCopy;
-  char delimiter[] = ":";
-  
-  anchorStringCopy = GNUNET_strdup (anchorString);
-
-  // split the string at the first occurrence of the delimiter
-  ptr = strtok (anchorStringCopy, delimiter);
-  egoNameCopy = GNUNET_strdup (ptr);
-  ptr = strtok (NULL, delimiter);
-
-  if (NULL == ptr)
-  {
-    // delimiter was not found
-    GNUNET_free (egoNameCopy);
-    GNUNET_free (anchorStringCopy);
-    return NULL;
-  }
-
-  data_size = strlen (ptr) + 1;
-  anchor = GNUNET_malloc (sizeof (struct GNUNET_ESCROW_Anchor) + data_size);
-  anchor->size = data_size;
-  anchor->egoName = egoNameCopy;
-  anchor->method = GNUNET_ESCROW_KEY_GNS;
-  
-  // TODO: deserialize?
-  GNUNET_memcpy (&anchor[1], ptr, data_size);
-
-  GNUNET_free (anchorStringCopy);
-
-  return anchor;
+  return ESCROW_anchor_string_to_data (anchorString,
+                                       GNUNET_ESCROW_KEY_GNS);
 }
 
 
@@ -1715,17 +1685,8 @@ char *
 gns_anchor_data_to_string (struct GNUNET_ESCROW_Handle *h,
                            struct GNUNET_ESCROW_Anchor *escrowAnchor)
 {
-  char *anchorString;
-  size_t egoNameSize;
-
-  egoNameSize = strlen (escrowAnchor->egoName);
-
-  anchorString = GNUNET_malloc (egoNameSize + 1 + escrowAnchor->size);
-  GNUNET_memcpy (anchorString, escrowAnchor->egoName, egoNameSize);
-  anchorString[egoNameSize] = ':';
-  GNUNET_memcpy (anchorString + egoNameSize + 1, &escrowAnchor[1], escrowAnchor->size);
-
-  return anchorString;
+  return ESCROW_anchor_data_to_string (escrowAnchor,
+                                       GNUNET_ESCROW_KEY_GNS);
 }
 
 
diff --git a/src/escrow/plugin_escrow_plaintext.c b/src/escrow/plugin_escrow_plaintext.c
index eace829ea..215c8127e 100644
--- a/src/escrow/plugin_escrow_plaintext.c
+++ b/src/escrow/plugin_escrow_plaintext.c
@@ -457,38 +457,8 @@ struct GNUNET_ESCROW_Anchor *
 plaintext_anchor_string_to_data (struct GNUNET_ESCROW_Handle *h,
                                  char *anchorString)
 {
-  struct GNUNET_ESCROW_Anchor *anchor;
-  uint32_t data_size;
-  char *anchorStringCopy, *ptr, *egoNameCopy;
-  char delimiter[] = ":";
-  
-  anchorStringCopy = GNUNET_strdup (anchorString);
-
-  // split the string at the first occurrence of the delimiter
-  ptr = strtok (anchorStringCopy, delimiter);
-  egoNameCopy = GNUNET_strdup (ptr);
-  ptr = strtok (NULL, delimiter);
-
-  if (NULL == ptr)
-  {
-    // delimiter was not found
-    GNUNET_free (egoNameCopy);
-    GNUNET_free (anchorStringCopy);
-    return NULL;
-  }
-
-  data_size = strlen (ptr) + 1;
-  anchor = GNUNET_malloc (sizeof (struct GNUNET_ESCROW_Anchor) + data_size);
-  anchor->size = data_size;
-  anchor->egoName = egoNameCopy;
-  anchor->method = GNUNET_ESCROW_KEY_PLAINTEXT;
-
-  // TODO: deserialize?
-  GNUNET_memcpy (&anchor[1], ptr, data_size);
-
-  GNUNET_free (anchorStringCopy);
-
-  return anchor;
+  return ESCROW_anchor_string_to_data (anchorString,
+                                       GNUNET_ESCROW_KEY_PLAINTEXT);
 }
 
 
@@ -504,17 +474,8 @@ char *
 plaintext_anchor_data_to_string (struct GNUNET_ESCROW_Handle *h,
                                  struct GNUNET_ESCROW_Anchor *escrowAnchor)
 {
-  char *anchorString;
-  size_t egoNameSize;
-
-  egoNameSize = strlen (escrowAnchor->egoName);
-
-  anchorString = GNUNET_malloc (egoNameSize + 1 + escrowAnchor->size);
-  GNUNET_memcpy (anchorString, escrowAnchor->egoName, egoNameSize);
-  anchorString[egoNameSize] = ':';
-  GNUNET_memcpy (anchorString + egoNameSize + 1, &escrowAnchor[1], escrowAnchor->size);
-
-  return anchorString;
+  return ESCROW_anchor_data_to_string (escrowAnchor,
+                                       GNUNET_ESCROW_KEY_PLAINTEXT);
 }