[hipl-commit] [tiny] Rev 3510: Removed absurd header include from hadb.h.
- From: Tim Just <tim.just@xxxxxxxxxxxxxx>
- To: hipl-commit@xxxxxxxxxxxxx
- Date: Fri, 29 Jan 2010 16:33:18 +0200
Committer: Tim Just <tim.just@xxxxxxxxxxxxxx>
Date: Fri Jan 29 15:31:49 2010 +0100
Revision: 3510
Revision-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: tiny
Log:
Removed absurd header include from hadb.h.
The needed includes are now placed in the corresponding C files.
Modified:
M hipd/hadb.c
M hipd/hadb.h
M hipd/heartbeat.c
M hipd/input.c
M hipd/netdev.c
M hipd/user.c
M modules/update/Makefile.am
M modules/update/hipd/update.c
M modules/update/hipd/update.h
M modules/update/hipd/update_legacy.c
M modules/update/hipd/update_legacy.h
M modules/update/module_info.xml
=== modified file 'hipd/hadb.c'
--- hipd/hadb.c 2010-01-22 14:29:13 +0000
+++ hipd/hadb.c 2010-01-29 14:31:49 +0000
@@ -7,6 +7,9 @@
#include "hadb.h"
#include "hipd.h"
+/* TODO Remove this include, when modularization is finished */
+#include "modules/update/hipd/update.h"
+
#define HIP_HADB_SIZE 53
#define HIP_MAX_HAS 100
=== modified file 'hipd/hadb.h'
--- hipd/hadb.h 2010-01-29 14:17:30 +0000
+++ hipd/hadb.h 2010-01-29 14:31:49 +0000
@@ -19,9 +19,6 @@
#include "nat.h"
#include "hadb_legacy.h"
-/* TODO Remove this include, when modularization is finished */
-#include "modules/update/hipd/update.h" // required for declaration of
update function
-
#define HIP_LOCK_INIT(ha)
#define HIP_LOCK_HA(ha)
#define HIP_UNLOCK_HA(ha)
=== modified file 'hipd/heartbeat.c'
--- hipd/heartbeat.c 2009-12-31 00:42:06 +0000
+++ hipd/heartbeat.c 2010-01-29 14:31:49 +0000
@@ -1,6 +1,9 @@
#include "heartbeat.h"
#include "maintenance.h"
+/* TODO Remove this include, when modularization is finished */
+#include "modules/update/hipd/update.h"
+
int hip_handle_update_heartbeat_trigger(hip_ha_t *ha, void *unused)
{
struct hip_locator_info_addr_item *locators;
=== modified file 'hipd/input.c'
--- hipd/input.c 2010-01-22 12:30:54 +0000
+++ hipd/input.c 2010-01-29 14:31:49 +0000
@@ -42,6 +42,9 @@
#include "oppipdb.h"
+/* TODO Remove this include, when modularization is finished */
+#include "modules/update/hipd/update.h"
+
#ifdef CONFIG_HIP_MIDAUTH
#include "pisa.h"
#endif
=== modified file 'hipd/netdev.c'
--- hipd/netdev.c 2010-01-21 16:49:45 +0000
+++ hipd/netdev.c 2010-01-29 14:31:49 +0000
@@ -15,6 +15,9 @@
#include "maintenance.h"
#include "netdev.h"
+/* TODO Remove this include, when modularization is finished */
+#include "modules/update/hipd/update.h"
+
/**
* We really don't expect more than a handfull of interfaces to be on
* our white list.
=== modified file 'hipd/user.c'
--- hipd/user.c 2010-01-29 14:17:30 +0000
+++ hipd/user.c 2010-01-29 14:31:49 +0000
@@ -21,6 +21,7 @@
#include "hipd.h"
/* TODO Remove these includes, when modularization is finished */
+#include "modules/update/hipd/update.h"
#include "modules/update/hipd/update_legacy.h"
int hip_sendto_user(const struct hip_common *msg, const struct sockaddr *dst){
=== modified file 'modules/update/Makefile.am'
--- modules/update/Makefile.am 2010-01-29 14:17:30 +0000
+++ modules/update/Makefile.am 2010-01-29 14:31:49 +0000
@@ -1,3 +1,4 @@
lib_LTLIBRARIES += modules/update/hipd/libhipupdate.la
-modules_update_hipd_libhipupdate_la_SOURCES = modules/update/hipd/update.c \
+modules_update_hipd_libhipupdate_la_SOURCES =
modules/update/hipd/update_init.c \
+ modules/update/hipd/update.c \
modules/update/hipd/update_legacy.c
\ No newline at end of file
=== modified file 'modules/update/hipd/update.c'
--- modules/update/hipd/update.c 2010-01-29 14:17:30 +0000
+++ modules/update/hipd/update.c 2010-01-29 14:31:49 +0000
@@ -31,12 +31,6 @@
int update_id_window_size = 50;
-int update_init(void)
-{
- HIP_DEBUG("update_init called!\n");
- return 0;
-}
-
int hip_create_locators(hip_common_t* locator_msg,
struct hip_locator_info_addr_item **locators)
{
=== modified file 'modules/update/hipd/update.h'
--- modules/update/hipd/update.h 2010-01-29 14:17:30 +0000
+++ modules/update/hipd/update.h 2010-01-29 14:31:49 +0000
@@ -12,8 +12,6 @@
#include "lib/core/builder.h"
#include "hipd/hadb.h"
-int update_init(void);
-
/**
* Sends all the locators from our active source address to the active
* destination addresses of all peers.
=== modified file 'modules/update/hipd/update_legacy.c'
--- modules/update/hipd/update_legacy.c 2010-01-29 14:17:30 +0000
+++ modules/update/hipd/update_legacy.c 2010-01-29 14:31:49 +0000
@@ -4,6 +4,7 @@
* base exchange code.
*/
+#include "update.h"
#include "update_legacy.h"
int hip_build_locators_old(struct hip_common *msg, uint32_t spi)
=== modified file 'modules/update/hipd/update_legacy.h'
--- modules/update/hipd/update_legacy.h 2010-01-29 14:17:30 +0000
+++ modules/update/hipd/update_legacy.h 2010-01-29 14:31:49 +0000
@@ -1,8 +1,6 @@
#ifndef UPDATE_LEGACY_H
#define UPDATE_LEGACY_H
-#include "update.h"
-
/**
* Builds udp and raw locator items into locator list to msg
* this is the extension of hip_build_locators in output.c
=== modified file 'modules/update/module_info.xml'
--- modules/update/module_info.xml 2010-01-29 14:17:30 +0000
+++ modules/update/module_info.xml 2010-01-29 14:31:49 +0000
@@ -12,7 +12,7 @@
<!-- Mandatory: name, header_file, init_function, linkcommand -->
<application
name="hipd"
- header_file="modules/update/hipd/update.h"
+ header_file="modules/update/hipd/update_init.h"
init_function="update_init"
linkcommand="hipd_hipd_LDADD += modules/update/hipd/libhipupdate.la" />
</module>
\ No newline at end of file
Other related posts:
- » [hipl-commit] [tiny] Rev 3510: Removed absurd header include from hadb.h. - Tim Just
