[hipl-commit] [trunk] Rev 4579: cosmetics: Move some functions around to avoid forward declarations.
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: hipl-commit@xxxxxxxxxxxxx
- Date: Sun, 23 May 2010 13:38:10 +0300
Committer: Diego Biurrun <diego@xxxxxxxxxx>
Date: 23/05/2010 at 13:38:10
Revision: 4579
Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk
Log:
cosmetics: Move some functions around to avoid forward declarations.
Modified:
M hipd/nat.c
=== modified file 'hipd/nat.c'
--- hipd/nat.c 2010-05-23 10:32:39 +0000
+++ hipd/nat.c 2010-05-23 10:37:53 +0000
@@ -38,8 +38,6 @@
#include "lib/core/debug.h"
-static int hip_ha_set_nat_mode(hip_ha_t *entry, void *mode);
-
/**
* Refreshes the port state of all NATs related to this host.
*
@@ -134,6 +132,18 @@
}
/**
+ * Get HIP NAT status.
+ * TODO doxygen header
+ */
+hip_transform_suite_t hip_get_nat_mode(hip_ha_t *entry)
+{
+ if (entry) {
+ return entry->nat_mode;
+ }
+ return hip_nat_status;
+}
+
+/**
* get the NAT mode for a host association
*
*
@@ -150,6 +160,28 @@
}
/**
+ * Sets NAT status "on" for a single host association.
+ *
+ * @param entry a pointer to a host association for which to set NAT status.
+ * @param mode nat mode
+ * @return zero.
+ * @note the status is changed just for the parameter host
+ * association. This function does @b not insert the host
+ * association into the host association database.
+ */
+static int hip_ha_set_nat_mode(hip_ha_t *entry, void *mode)
+{
+ int err = 0;
+ if (entry && mode != HIP_NAT_MODE_NONE) {
+ hip_hadb_set_xmit_function_set(entry, &nat_xmit_func_set);
+ entry->nat_mode = *((hip_transform_suite_t *) mode);
+ HIP_DEBUG("NAT status of host association %p: %d\n",
+ entry, entry->nat_mode);
+ }
+ return err;
+}
+
+/**
* Set the NAT mode for a host association
*
*
@@ -207,37 +239,3 @@
out_err:
return err;
}
-
-/**
- * Get HIP NAT status.
- * TODO doxygen header
- */
-hip_transform_suite_t hip_get_nat_mode(hip_ha_t *entry)
-{
- if (entry) {
- return entry->nat_mode;
- }
- return hip_nat_status;
-}
-
-/**
- * Sets NAT status "on" for a single host association.
- *
- * @param entry a pointer to a host association for which to set NAT status.
- * @param mode nat mode
- * @return zero.
- * @note the status is changed just for the parameter host
- * association. This function does @b not insert the host
- * association into the host association database.
- */
-static int hip_ha_set_nat_mode(hip_ha_t *entry, void *mode)
-{
- int err = 0;
- if (entry && mode != HIP_NAT_MODE_NONE) {
- hip_hadb_set_xmit_function_set(entry, &nat_xmit_func_set);
- entry->nat_mode = *((hip_transform_suite_t *) mode);
- HIP_DEBUG("NAT status of host association %p: %d\n",
- entry, entry->nat_mode);
- }
- return err;
-}
Other related posts:
- » [hipl-commit] [trunk] Rev 4579: cosmetics: Move some functions around to avoid forward declarations. - Diego Biurrun
