------------------------------------------------------------ revno: 5150 committer: Diego Biurrun <diego@xxxxxxxxxx> branch nick: trunk timestamp: Fri 2010-11-12 17:42:54 +0100 message: Move modularization source files into lib/core. This is the only suitable place for them now that there is no separate library for the modularization feature. removed: lib/modularization/ renamed: lib/modularization/lmod.c => lib/core/modularization.c lib/modularization/lmod.h => lib/core/modularization.h modified: Makefile.am hipd/esp_prot_light_update.h hipd/maintenance.c hipd/pkt_handling.c hipd/user.c lib/core/state.h modules/heartbeat/hipd/heartbeat.c modules/update/hipd/update.c lib/core/modularization.c lib/core/modularization.h -- lp:hipl https://code.launchpad.net/~hipl-core/hipl/trunk Your team HIPL core team is subscribed to branch lp:hipl. To unsubscribe from this branch go to https://code.launchpad.net/~hipl-core/hipl/trunk/+edit-subscription
=== modified file 'Makefile.am' --- Makefile.am 2010-11-12 16:31:19 +0000 +++ Makefile.am 2010-11-12 16:42:54 +0000 @@ -166,12 +166,12 @@ lib/core/keylen.c \ lib/core/linkedlist.c \ lib/core/message.c \ + lib/core/modularization.c \ lib/core/prefix.c \ lib/core/solve.c \ lib/core/statistics.c \ lib/core/straddr.c \ lib/core/transform.c \ - lib/modularization/lmod.c \ lib/tool/checksum.c \ lib/tool/lutil.c \ lib/tool/nlink.c \ === modified file 'hipd/esp_prot_light_update.h' --- hipd/esp_prot_light_update.h 2010-10-15 15:29:14 +0000 +++ hipd/esp_prot_light_update.h 2010-11-12 16:42:54 +0000 @@ -37,7 +37,7 @@ #define HIP_HIPD_ESP_PROT_LIGHT_UPDATE_H #include "lib/core/protodefs.h" -#include "lib/modularization/lmod.h" +#include "lib/core/modularization.h" int esp_prot_send_light_update(hip_ha_t *entry, const int anchor_offset[], === modified file 'hipd/maintenance.c' --- hipd/maintenance.c 2010-10-15 15:29:14 +0000 +++ hipd/maintenance.c 2010-11-12 16:42:54 +0000 @@ -50,7 +50,7 @@ #include "lib/core/ife.h" #include "lib/core/linkedlist.h" #include "lib/core/protodefs.h" -#include "lib/modularization/lmod.h" +#include "lib/core/modularization.h" #include "config.h" #include "accessor.h" #include "close.h" === modified file 'hipd/pkt_handling.c' --- hipd/pkt_handling.c 2010-10-15 15:29:14 +0000 +++ hipd/pkt_handling.c 2010-11-12 16:42:54 +0000 @@ -36,7 +36,7 @@ #include "lib/core/linkedlist.h" #include "lib/core/protodefs.h" #include "lib/core/state.h" -#include "lib/modularization/lmod.h" +#include "lib/core/modularization.h" #include "pkt_handling.h" === modified file 'hipd/user.c' --- hipd/user.c 2010-10-15 15:29:14 +0000 +++ hipd/user.c 2010-11-12 16:42:54 +0000 @@ -67,7 +67,7 @@ #include "lib/core/linkedlist.h" #include "lib/core/prefix.h" #include "lib/core/protodefs.h" -#include "lib/modularization/lmod.h" +#include "lib/core/modularization.h" #include "lib/tool/nlink.h" #include "config.h" #include "accessor.h" === renamed file 'lib/modularization/lmod.c' => 'lib/core/modularization.c' --- lib/modularization/lmod.c 2010-10-27 11:11:20 +0000 +++ lib/core/modularization.c 2010-11-12 16:42:54 +0000 @@ -25,7 +25,7 @@ /** * @file - * @brief The main source file for libmodularization (lmod). + * @brief Allow modularized features that can be enabled as required. * * @author Tim Just <tim.just@xxxxxxxxxxxxxx> */ @@ -34,7 +34,7 @@ #include <stdlib.h> #include <string.h> -#include "lmod.h" +#include "modularization.h" /** * A generic struct for function pointer. === renamed file 'lib/modularization/lmod.h' => 'lib/core/modularization.h' --- lib/modularization/lmod.h 2010-10-15 15:29:14 +0000 +++ lib/core/modularization.h 2010-11-12 16:42:54 +0000 @@ -28,8 +28,8 @@ * @author Tim Just <tim.just@xxxxxxxxxxxxxx> */ -#ifndef HIP_LIB_MODULARIZATION_LMOD_H -#define HIP_LIB_MODULARIZATION_LMOD_H +#ifndef HIP_LIB_CORE_MODULARIZATION_H +#define HIP_LIB_CORE_MODULARIZATION_H #include <stdint.h> @@ -73,4 +73,4 @@ void lmod_uninit_packet_types(void); -#endif /* HIP_LIB_MODULARIZATION_LMOD_H */ +#endif /* HIP_LIB_CORE_MODULARIZATION_H */ === modified file 'lib/core/state.h' --- lib/core/state.h 2010-10-15 15:29:14 +0000 +++ lib/core/state.h 2010-11-12 16:42:54 +0000 @@ -38,9 +38,9 @@ #include <sys/types.h> #include "hipd/cookie.h" -#include "lib/modularization/lmod.h" #include "config.h" #include "hashtable.h" +#include "modularization.h" #include "protodefs.h" #include "statistics.h" === removed directory 'lib/modularization' === modified file 'modules/heartbeat/hipd/heartbeat.c' --- modules/heartbeat/hipd/heartbeat.c 2010-09-25 18:30:26 +0000 +++ modules/heartbeat/hipd/heartbeat.c 2010-11-12 16:42:54 +0000 @@ -85,7 +85,7 @@ #include "lib/core/protodefs.h" #include "lib/core/statistics.h" #include "lib/core/straddr.h" -#include "lib/modularization/lmod.h" +#include "lib/core/modularization.h" #include "lib/tool/nlink.h" #include "heartbeat.h" === modified file 'modules/update/hipd/update.c' --- modules/update/hipd/update.c 2010-09-25 18:30:26 +0000 +++ modules/update/hipd/update.c 2010-11-12 16:42:54 +0000 @@ -61,7 +61,7 @@ #include "lib/core/prefix.h" #include "lib/core/protodefs.h" #include "lib/core/solve.h" -#include "lib/modularization/lmod.h" +#include "lib/core/modularization.h" #include "update_legacy.h" #include "update.h"