Cleanup STUN headers.

darcs-hash:20060322201536-7659e-25ef3a9607dc851e0a427ccdd7e15b47757e9f78.gz

libsofia-sip-ua/stun/sofia-sip/stun.h

@@ -159,10 +159,6 @@ typedef void (*stun_dns_lookup_f)(stun_dns_lookup_t *self,
 /* -------------------------------------------------------------------
  * Functions for managing STUN handles. */
 
-char const *stun_str_state(stun_state_t state);
-
-/** Check if a STUN handle should be created. */
-
 stun_handle_t *stun_handle_create(stun_magic_t *context,
 				  su_root_t *root,
 				  stun_event_f cb,
@@ -172,6 +168,7 @@ void stun_handle_destroy(stun_handle_t *sh);
 
 su_root_t *stun_root(stun_handle_t *sh);
 int stun_is_requested(tag_type_t tag, tag_value_t value, ...);
+char const *stun_str_state(stun_state_t state);
 
 /* ------------------------------------------------------------------- 
  * Functions for 'Binding Discovery' usage (RFC3489/3489bis) */
@@ -189,8 +186,8 @@ int stun_get_nattype(stun_handle_t *sh,
 		     stun_discovery_magic_t *magic,
 		     tag_type_t tag, tag_value_t value,
 		     ...);
-
 char const *stun_nattype(stun_discovery_t *sd);
+
 su_sockaddr_t *stun_discovery_get_address(stun_discovery_t *sd);
 su_socket_t stun_discovery_get_socket(stun_discovery_t *sd);
 
@@ -199,7 +196,6 @@ int stun_get_lifetime(stun_handle_t *sh,
 		      stun_discovery_magic_t *magic,
 		      tag_type_t tag, tag_value_t value,
 		      ...);
-
 int stun_lifetime(stun_discovery_t *sd);
 
 /* ------------------------------------------------------------------- 
@@ -234,10 +230,7 @@ int stun_keepalive_destroy(stun_handle_t *sh, su_socket_t s);
 /* -------------------------------------------------------------------
  * Functions for 'Short-Term password' usage (RFC3489bis) */
 
-/* Return socket attached to discovery object */
-su_socket_t stun_discovery_get_socket(stun_discovery_t *sd);
-
-
+/* (not implemented, see stun_request_shared_secret()) */
 
 /* --------------------------------------------------------------------
  * Deprecated functions. These are supported with limited

libsofia-sip-ua/stun/stun.c

@@ -3011,7 +3011,9 @@ int stun_process_request(su_socket_t s, stun_msg_t *req,
   return 0;
 } 
 
-/** Return socket attached to discovery object */
+/**
+ * Returns socket attached to the discovery object 
+ */
 su_socket_t stun_discovery_get_socket(stun_discovery_t *sd)
 {
   assert(sd);

libsofia-sip-ua/stun/stun_dns.c

@@ -55,7 +55,6 @@ struct stun_dns_lookup_s {
   su_root_t         *stun_root;
   stun_magic_t      *stun_magic;
   sres_resolver_t   *stun_sres;
-  sres_record_t    **stun_answers;
   int                stun_socket;
   stun_dns_lookup_f  stun_cb;
   char              *stun_tls_target;