[hipl-commit] [tiny] Rev 3543: Fixed issues caused by synchronization to trunk.

  • From: Tim Just <tim.just@xxxxxxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Mon, 22 Feb 2010 12:58:56 +0200

Committer: Tim Just <tim.just@xxxxxxxxxxxxxx>
Date: Mon Feb 22 11:58:09 2010 +0100
Revision: 3543
Revision-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: tiny

Log:
  Fixed issues caused by synchronization to trunk.

Modified:
  M  configure.ac
  M  lib/conf/hipconf.c
  M  lib/core/state.h
  M  lib/modularization/modularization.h

=== modified file 'configure.ac'
--- configure.ac        2010-02-22 10:46:43 +0000
+++ configure.ac        2010-02-22 10:58:09 +0000
@@ -158,7 +158,7 @@
 AC_ARG_ENABLE(maemo,
              AC_HELP_STRING([--enable-maemo],
                             [Maemo (default is NO)]),
-             [ac_cv_use_maemo=$enableval ac_cv_use_altsep=yes ac_cv_use_i3=no],
+             [ac_cv_use_maemo=$enableval ac_cv_use_altsep=yes],
              [ac_cv_use_maemo=no])
 AC_CACHE_CHECK([whether to use Maemo],
                [ac_cv_use_maemo], [ac_cv_use_maemo=no])

=== modified file 'lib/conf/hipconf.c'
--- lib/conf/hipconf.c  2010-02-22 10:46:43 +0000
+++ lib/conf/hipconf.c  2010-02-22 10:58:09 +0000
@@ -2699,14 +2699,14 @@
     hip_conf_handle_load,               /* 11: TYPE_CONFIG */
     hip_conf_handle_run_normal,         /* 12: TYPE_RUN */
     NULL,                               /* was 13: TYPE_TTL */
-    hip_conf_handle_gw,                 /* 14: TYPE_GW */
-    hip_conf_handle_get,                /* 15: TYPE_GET */
+    NULL,                               /* unused, was 14: TYPE_GW */
+    NULL,                               /* unused, was 15: TYPE_GET */
     hip_conf_handle_ha,                 /* 16: TYPE_HA */
     hip_conf_handle_mhaddr,             /* 17: TYPE_MHADDR */
     hip_conf_handle_debug,              /* 18: TYPE_DEBUG */
     hip_conf_handle_restart,            /* 19: TYPE_DAEMON */
     hip_conf_handle_locator,            /* 20: TYPE_LOCATOR */
-    hip_conf_handle_set,                /* 21: TYPE_SET */
+    NULL,                               /* 21: unused, was TYPE_SET */
     NULL,                               /* 22: unused, was TYPE_DHT */
     hip_conf_handle_opptcp,             /* 23: TYPE_OPPTCP */
     hip_conf_handle_trans_order,        /* 24: TYPE_ORDER */
@@ -2715,7 +2715,7 @@
     hip_conf_handle_heartbeat,          /* 27: TYPE_HEARTBEAT */
     NULL,                               /* 28: unused, was TYPE_HI3 */
     NULL,                               /* 29: unused */
-    hip_conf_handle_buddies_toggle,     /* 30: TYPE_BUDDIES */
+    NULL,                               /* 30: unused, was TYPE_BUDDIES */
     NULL,                               /* 31: TYPE_SAVAHR, reserved for sava 
*/
     hip_conf_handle_nsupdate,           /* 32: TYPE_NSUPDATE */
     hip_conf_handle_hit_to_ip,          /* 33: TYPE_HIT_TO_IP */

=== modified file 'lib/core/state.h'
--- lib/core/state.h    2010-02-22 09:56:58 +0000
+++ lib/core/state.h    2010-02-22 10:58:09 +0000
@@ -518,18 +518,6 @@
     struct timeval  bex_duration;
 };
 
-/**
- * @todo add description
- */
-struct hip_packet_context {
-    struct hip_common         *msg;
-    struct in6_addr           *src_addr;
-    struct in6_addr           *dst_addr;
-    struct hip_stateless_info *msg_info;
-    struct hip_hadb_state     *hadb_entry;
-};
-
-
 struct hip_turn_info {
     uint32_t        spi;
     struct in6_addr peer_address;

=== modified file 'lib/modularization/modularization.h'
--- lib/modularization/modularization.h 2010-02-22 09:56:58 +0000
+++ lib/modularization/modularization.h 2010-02-22 10:58:09 +0000
@@ -18,6 +18,17 @@
 /**
  * @todo add description
  */
+struct hip_packet_context {
+    struct hip_common         *msg;
+    struct in6_addr           *src_addr;
+    struct in6_addr           *dst_addr;
+    struct hip_stateless_info *msg_info;
+    struct hip_hadb_state     *hadb_entry;
+};
+
+/**
+ * @todo add description
+ */
 struct modular_state {
     hip_ll_t        *item_list;
     char           **item_names;

Other related posts:

  • » [hipl-commit] [tiny] Rev 3543: Fixed issues caused by synchronization to trunk. - Tim Just