towards moving STUN logic into new NAT service

1 files changed, 0 insertions, 126 deletions

diff --git a/src/nat/nat_stun.c b/src/nat/nat_stun.c
index b914abb2e..62916ab84 100644
--- a/src/nat/nat_stun.c
+++ b/src/nat/nat_stun.c
@@ -104,32 +104,6 @@ struct StunState
 
 
 /**
- * Convert a message to a StunClass
- *
- * @param msg the received message
- * @return the converted StunClass
- */
-static int
-decode_class(int msg)
-{
-  /* Sorry for the magic, but this maps the class according to rfc5245 */
-  return ((msg & 0x0010) >> 4) | ((msg & 0x0100) >> 7);
-}
-
-/**
- * Convert a message to a StunMethod
- *
- * @param msg the received message
- * @return the converted StunMethod
- */
-static int
-decode_method(int msg)
-{
-  return (msg & 0x000f) | ((msg & 0x00e0) >> 1) | ((msg & 0x3e00) >> 2);
-}
-
-
-/**
  * Encode a class and method to a compatible STUN format
  *
  * @param msg_class class to be converted
@@ -146,106 +120,6 @@ encode_message (enum StunClasses msg_class,
 
 
 /**
- * Print a class and method from a STUN message
- *
- * @param msg
- * @return string with the message class and method
- */
-static const char *
-stun_msg2str(int msg)
-{
-  static const struct {
-    enum StunClasses value;
-    const char *name;
-  } classes[] = {
-    { STUN_REQUEST, "Request" },
-    { STUN_INDICATION, "Indication" },
-    { STUN_RESPONSE, "Response" },
-    { STUN_ERROR_RESPONSE, "Error Response" },
-    { 0, NULL }
-  };
-  static const struct {
-    enum StunMethods value;
-    const char *name;
-  } methods[] = {
-    { STUN_BINDING, "Binding" },
-    { 0, NULL }
-  };
-  static char result[32];
-  const char *msg_class = NULL;
-  const char *method = NULL;
-  int i;
-  int value;
-
-  value = decode_class(msg);
-  for (i = 0; classes[i].name; i++)
-  {
-    msg_class = classes[i].name;
-    if (classes[i].value == value)
-      break;
-  }
-  value = decode_method(msg);
-  for (i = 0; methods[i].name; i++)
-  {
-    method = methods[i].name;
-    if (methods[i].value == value)
-      break;
-  }
-  GNUNET_snprintf (result,
-                   sizeof(result),
-                   "%s %s",
-                   method ? : "Unknown Method",
-                   msg_class ? : "Unknown Class Message");
-  return result;
-}
-
-
-/**
- * Print attribute name
- *
- * @param msg with a attribute type
- * @return string with the attribute name
- */
-static const char *
-stun_attr2str (int msg)
-{
-  static const struct {
-    enum StunAttributes value;
-    const char *name;
-  } attrs[] = {
-    { STUN_MAPPED_ADDRESS, "Mapped Address" },
-    { STUN_RESPONSE_ADDRESS, "Response Address" },
-    { STUN_CHANGE_ADDRESS, "Change Address" },
-    { STUN_SOURCE_ADDRESS, "Source Address" },
-    { STUN_CHANGED_ADDRESS, "Changed Address" },
-    { STUN_USERNAME, "Username" },
-    { STUN_PASSWORD, "Password" },
-    { STUN_MESSAGE_INTEGRITY, "Message Integrity" },
-    { STUN_ERROR_CODE, "Error Code" },
-    { STUN_UNKNOWN_ATTRIBUTES, "Unknown Attributes" },
-    { STUN_REFLECTED_FROM, "Reflected From" },
-    { STUN_REALM, "Realm" },
-    { STUN_NONCE, "Nonce" },
-    { STUN_XOR_MAPPED_ADDRESS, "XOR Mapped Address" },
-    { STUN_MS_VERSION, "MS Version" },
-    { STUN_MS_XOR_MAPPED_ADDRESS, "MS XOR Mapped Address" },
-    { STUN_SOFTWARE, "Software" },
-    { STUN_ALTERNATE_SERVER, "Alternate Server" },
-    { STUN_FINGERPRINT, "Fingerprint" },
-    { 0, NULL }
-  };
-  unsigned int i;
-
-  for (i = 0; attrs[i].name; i++)
-  {
-    if (attrs[i].value == msg)
-      return attrs[i].name;
-  }
-  return "Unknown Attribute";
-}
-
-
-/**
  * Fill the stun_header with a random request_id
  *
  * @param req, stun header to be filled