print active/inactive information

[oweals/gnunet.git] / src / include / gnunet_nat_lib.h

diff --git a/src/include/gnunet_nat_lib.h b/src/include/gnunet_nat_lib.h
index 654fbb3c3284d1c8022a8ae5d6b5df865d1b14e5..ebedc4ba4f89708324f0bcd44e19e5e6e6a83519 100644 (file)
--- a/src/include/gnunet_nat_lib.h
+++ b/src/include/gnunet_nat_lib.h
@@ -80,6 +80,21 @@ enum GNUNET_NAT_FailureCode
    */
   GNUNET_NAT_ERROR_SUCCESS = GNUNET_OK,
   
+  /**
+   * `external-ip' command not found
+   */
+  GNUNET_NAT_ERROR_IPC_FAILURE,
+  
+  /**
+   * `external-ip' command not found
+   */
+  GNUNET_NAT_ERROR_TIMEOUT,
+  
+  /**
+   * `external-ip' command not found
+   */
+  GNUNET_NAT_ERROR_NOT_ONLINE,
+  
   /**
    * `upnpc` command not found
    */
@@ -105,16 +120,51 @@ enum GNUNET_NAT_FailureCode
    */
   GNUNET_NAT_ERROR_EXTERNAL_IP_UTILITY_NOT_FOUND,
   
+  /**
+   * `external-ip' command not found
+   */
+  GNUNET_NAT_ERROR_EXTERNAL_IP_UTILITY_NOT_EXECUTEABLE,
+  
+  /**
+   * `external-ip' command not found
+   */
+  GNUNET_NAT_ERROR_EXTERNAL_IP_UTILITY_OUTPUT_INVALID,
+  
   /**
    * "no valid address was returned by `external-ip'"
    */
-  GNUNET_NAT_ERROR_EXTERNAL_IP_NO_VALID_ADDRESS_FOUND,
-    
+  GNUNET_NAT_ERROR_EXTERNAL_IP_ADDRESS_INVALID,
+  
+  /**
+   * Could not determine interface with internal/local network address
+   */
+  GNUNET_NAT_ERROR_NO_VALID_IF_IP_COMBO,
+          
+  /**
+   * No working gnunet-helper-nat-server found
+   */
+  GNUNET_NAT_ERROR_HELPER_NAT_SERVER_NOT_FOUND,
+  
+  /**
+   * NAT test could not be initialized
+   */
+  GNUNET_NAT_ERROR_NAT_TEST_START_FAILED,
+  
+  /**
+   * NAT test timeout
+   */
+  GNUNET_NAT_ERROR_NAT_TEST_TIMEOUT,
+  
   /**
    * 
    */
-  GNUNET_NAT_ERROR_  
+  GNUNET_NAT_ERROR_HELPER_NAT_CLIENT_NOT_FOUND,
   
+  
+  /**
+   * 
+   */
+  GNUNET_NAT_ERROR_
 };
 
 
@@ -219,6 +269,7 @@ typedef void (*GNUNET_NAT_TestCallback) (void *cls,
  * @param is_tcp #GNUNET_YES to test TCP, #GNUNET_NO to test UDP
  * @param bnd_port port to bind to, 0 for connection reversal
  * @param adv_port externally advertised port to use
+ * @param timeout delay after which the test should be aborted
  * @param report function to call with the result of the test
  * @param report_cls closure for @a report
  * @return handle to cancel NAT test
@@ -228,6 +279,7 @@ GNUNET_NAT_test_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
                        int is_tcp,
                        uint16_t bnd_port,
                        uint16_t adv_port,
+                       struct GNUNET_TIME_Relative timeout,
                        GNUNET_NAT_TestCallback report,
                        void *report_cls);