[pisa-src] r1424 - in trunk: community-operator/co_client.c community-operator/co_common_packets.h community-operator/co_server.c community-operator/pisa_cert.c configure.ac pairing/accept.c pairing/common.c ...
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Thu, 29 Oct 2009 17:06:26 +0100
Author: biurrun
Date: Thu Oct 29 17:06:25 2009
New Revision: 1424
Log:
Drop -Ilibpisa from CPPFLAGS.
Instead, pass the relative header path to #include.
Modified:
trunk/community-operator/co_client.c
trunk/community-operator/co_common_packets.h
trunk/community-operator/co_server.c
trunk/community-operator/pisa_cert.c
trunk/configure.ac
trunk/pairing/accept.c
trunk/pairing/common.c
trunk/pairing/libconfig_wrapper.c
trunk/pairing/libconfig_wrapper.h
trunk/pairing/management.c
trunk/pairing/packet_handler_accept.c
trunk/performance/pisaperf.c
trunk/pisacd/cdconf.c
trunk/pisacd/cdconf.h
trunk/pisacd/cdconfhandlers.c
trunk/pisacd/cdconfhandlers.h
trunk/pisacd/cdctx.c
trunk/pisacd/cdctx.h
trunk/pisacd/cdderegister.h
trunk/pisacd/cdheartbeat.c
trunk/pisacd/cdheartbeat.h
trunk/pisacd/cdmain.c
trunk/pisacd/cdpending.c
trunk/pisacd/cdpending.h
trunk/pisacd/cdregister.c
trunk/pisacd/cdregister.h
trunk/pisacd/cdservers.c
trunk/pisacd/cdservers.h
trunk/pisacd/cdtimeout.c
trunk/pisacd/cdtun.c
trunk/pisacd/pisacdconf.c
trunk/pisacd/pisaconftool.c
trunk/pisasd/pisaconftool.c
trunk/pisasd/pisasdconf.c
trunk/pisasd/sdclients.c
trunk/pisasd/sdconf.c
trunk/pisasd/sdconf.h
trunk/pisasd/sdctx.c
trunk/pisasd/sdctx.h
trunk/pisasd/sdderegister.h
trunk/pisasd/sdheartbeat.h
trunk/pisasd/sdmain.c
trunk/pisasd/sdnat.c
trunk/pisasd/sdregister.c
trunk/pisasd/sdregister.h
trunk/pisasd/sdtun.c
trunk/pisasd/sdtun.h
trunk/test/checkhipd.c
trunk/test/getns.c
trunk/test/ifdefgw.c
Modified: trunk/community-operator/co_client.c
==============================================================================
--- trunk/community-operator/co_client.c Thu Oct 29 17:05:27 2009
(r1423)
+++ trunk/community-operator/co_client.c Thu Oct 29 17:06:25 2009
(r1424)
@@ -10,14 +10,14 @@
#include <unistd.h>
#include <dirent.h>
-#include "global.h"
+#include "libpisa/global.h"
#define __USE_XOPEN
#include <time.h>
#include "co_common_packets.h"
-#include "cfg.h"
-#include "debug.h"
+#include "libpisa/cfg.h"
+#include "libpisa/debug.h"
#include "pisa_cert.h" // Copied from HIPL firewall directory
Modified: trunk/community-operator/co_common_packets.h
==============================================================================
--- trunk/community-operator/co_common_packets.h Thu Oct 29 17:05:27
2009 (r1423)
+++ trunk/community-operator/co_common_packets.h Thu Oct 29 17:06:25
2009 (r1424)
@@ -6,7 +6,7 @@
#ifndef PISA_CO_COMMON_PACKETS_H
#define PISA_CO_COMMON_PACKETS_H
-#include "global.h"
+#include "libpisa/global.h"
#define LENGTH_ERROR_MESSAGE 128
Modified: trunk/community-operator/co_server.c
==============================================================================
--- trunk/community-operator/co_server.c Thu Oct 29 17:05:27 2009
(r1423)
+++ trunk/community-operator/co_server.c Thu Oct 29 17:06:25 2009
(r1424)
@@ -11,11 +11,11 @@
#include <signal.h>
#include "config.h"
-#include "global.h"
-#include "debug.h"
+#include "libpisa/global.h"
+#include "libpisa/debug.h"
#include "co_common_packets.h"
-#include "cfg.h"
-#include "hitlist.h"
+#include "libpisa/cfg.h"
+#include "libpisa/hitlist.h"
#include "hipl.h"
#ifdef CONFIG_PISA_WITH_HIPL
Modified: trunk/community-operator/pisa_cert.c
==============================================================================
--- trunk/community-operator/pisa_cert.c Thu Oct 29 17:05:27 2009
(r1423)
+++ trunk/community-operator/pisa_cert.c Thu Oct 29 17:06:25 2009
(r1424)
@@ -17,7 +17,7 @@
#include <string.h>
#include <stdio.h>
-#include "global.h"
+#include "libpisa/global.h"
/**
* Extract parts of a SPKI certificate.
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/configure.ac Thu Oct 29 17:06:25 2009 (r1424)
@@ -151,7 +151,7 @@
AC_SUBST(sysconfdir, ${sysconfdir}/pisa)
# Set default CFLAGS for the complete project.
-AC_SUBST(CFLAGS, "$CFLAGS -g -O2 -Wall -Ilibpisa -I../libpisa")
+AC_SUBST(CFLAGS, "$CFLAGS -g -O2 -Wall")
# This is needed to export the _expanded_ value of the variable to config.h.
AC_DEFINE_UNQUOTED(PISA_SYSCONFDIR, "$(eval echo $sysconfdir)")
Modified: trunk/pairing/accept.c
==============================================================================
--- trunk/pairing/accept.c Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pairing/accept.c Thu Oct 29 17:06:25 2009 (r1424)
@@ -11,9 +11,9 @@
* @date Sep. 2008
*/
-#include "global.h" /* it must be included before all other header files */
-#include "cfg.h"
-#include "hitlist.h"
+#include "libpisa/global.h" /* it must be included before all other header
files */
+#include "libpisa/cfg.h"
+#include "libpisa/hitlist.h"
#include "accept.h"
extern config_t authorized_cfg;
Modified: trunk/pairing/common.c
==============================================================================
--- trunk/pairing/common.c Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pairing/common.c Thu Oct 29 17:06:25 2009 (r1424)
@@ -12,13 +12,13 @@
*/
-#include "global.h" /* it must be included before all other header files */
+#include "libpisa/global.h" /* it must be included before all other header
files */
#define __USE_XOPEN
#include <time.h>
#include "common.h"
-#include "cfg.h"
+#include "libpisa/cfg.h"
#include "libconfig_wrapper.h"
#include "common_headers.h"
Modified: trunk/pairing/libconfig_wrapper.c
==============================================================================
--- trunk/pairing/libconfig_wrapper.c Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pairing/libconfig_wrapper.c Thu Oct 29 17:06:25 2009 (r1424)
@@ -12,8 +12,8 @@
*/
#include "libconfig_wrapper.h"
-#include "cfg.h"
-#include "hitlist.h"
+#include "libpisa/cfg.h"
+#include "libpisa/hitlist.h"
#include "packet_handler_accept.h"
#include "common.h"
Modified: trunk/pairing/libconfig_wrapper.h
==============================================================================
--- trunk/pairing/libconfig_wrapper.h Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pairing/libconfig_wrapper.h Thu Oct 29 17:06:25 2009 (r1424)
@@ -17,7 +17,7 @@
// This is a wrapper for the libconfig configuration file reader
#include "common.h"
#include <libconfig.h>
-#include "hitlist.h"
+#include "libpisa/hitlist.h"
#define FILE_AUTHORIZED_HOSTS "authorized_hosts.cfg"
Modified: trunk/pairing/management.c
==============================================================================
--- trunk/pairing/management.c Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pairing/management.c Thu Oct 29 17:06:25 2009 (r1424)
@@ -19,14 +19,14 @@
#include <getopt.h>
#include <fcntl.h>
-#include "global.h" /* it must be included before all other header files */
-#include "cfg.h"
-#include "debug.h"
+#include "libpisa/global.h" /* it must be included before all other header
files */
+#include "libpisa/cfg.h"
+#include "libpisa/debug.h"
#include "common_headers.h"
#include "common.h"
-#include "util.h"
+#include "libpisa/util.h"
#include "libconfig_wrapper.h"
-#include "hitlist.h"
+#include "libpisa/hitlist.h"
#include "management.h"
extern config_t cfg;
Modified: trunk/pairing/packet_handler_accept.c
==============================================================================
--- trunk/pairing/packet_handler_accept.c Thu Oct 29 17:05:27 2009
(r1423)
+++ trunk/pairing/packet_handler_accept.c Thu Oct 29 17:06:25 2009
(r1424)
@@ -11,9 +11,9 @@
* @date Sep. 2008
*/
-#include "global.h" /* it must be included before all other header files */
-#include "cfg.h"
-#include "hitlist.h"
+#include "libpisa/global.h" /* it must be included before all other header
files */
+#include "libpisa/cfg.h"
+#include "libpisa/hitlist.h"
#include "packet_handler_accept.h"
Modified: trunk/performance/pisaperf.c
==============================================================================
--- trunk/performance/pisaperf.c Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/performance/pisaperf.c Thu Oct 29 17:06:25 2009 (r1424)
@@ -13,8 +13,8 @@
* This file provides a set of functions to mneasure execution time.
*/
#include "pisaperf.h"
-#include "debug.h"
-#include "util.h" /* PISA_IFEL */
+#include "libpisa/debug.h"
+#include "libpisa/util.h" /* PISA_IFEL */
int pisa_perf_enabled(void){
Modified: trunk/pisacd/cdconf.c
==============================================================================
--- trunk/pisacd/cdconf.c Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisacd/cdconf.c Thu Oct 29 17:06:25 2009 (r1424)
@@ -10,10 +10,10 @@
* @date Jan. 2009
*/
-#include "debug.h"
-#include "cfg.h"
+#include "libpisa/debug.h"
+#include "libpisa/cfg.h"
#include "cdconf.h"
-#include "util.h"
+#include "libpisa/util.h"
#include "cdctx.h"
#define PISACD_DEFAULT_IDLE_DISCONNECT_DELAY 600
Modified: trunk/pisacd/cdconf.h
==============================================================================
--- trunk/pisacd/cdconf.h Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisacd/cdconf.h Thu Oct 29 17:06:25 2009 (r1424)
@@ -13,8 +13,8 @@
#ifndef PISA_CDCONF_H
#define PISA_CDCONF_H
-#include "global.h"
-#include "debug.h"
+#include "libpisa/global.h"
+#include "libpisa/debug.h"
/**
* data structure containing all configurations about the current client.
Modified: trunk/pisacd/cdconfhandlers.c
==============================================================================
--- trunk/pisacd/cdconfhandlers.c Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisacd/cdconfhandlers.c Thu Oct 29 17:06:25 2009 (r1424)
@@ -17,11 +17,11 @@
#include <stdlib.h>
#include <string.h>
-#include "debug.h"
-#include "pisaconf.h"
-#include "packet.h"
-#include "conmgr.h"
-#include "nat.h"
+#include "libpisa/debug.h"
+#include "libpisa/pisaconf.h"
+#include "libpisa/packet.h"
+#include "libpisa/conmgr.h"
+#include "libpisa/nat.h"
#include "cdctx.h"
#include "cdservers.h"
Modified: trunk/pisacd/cdconfhandlers.h
==============================================================================
--- trunk/pisacd/cdconfhandlers.h Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisacd/cdconfhandlers.h Thu Oct 29 17:06:25 2009 (r1424)
@@ -13,7 +13,7 @@
#ifndef PISA_CDCONFHANDLERS_H
#define PISA_CDCONFHANDLERS_H
-#include "pisaconf.h"
+#include "libpisa/pisaconf.h"
void pisa_cdconf_cb_server_add(pisa_conf_packet *packet);
void pisa_cdconf_cb_service_add(pisa_conf_packet *packet);
Modified: trunk/pisacd/cdctx.c
==============================================================================
--- trunk/pisacd/cdctx.c Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisacd/cdctx.c Thu Oct 29 17:06:25 2009 (r1424)
@@ -12,7 +12,7 @@
#include "cdctx.h"
#include "cdconf.h"
-#include "util.h"
+#include "libpisa/util.h"
/**
* cd_ctx contains all of the necessary information about the current
Modified: trunk/pisacd/cdctx.h
==============================================================================
--- trunk/pisacd/cdctx.h Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisacd/cdctx.h Thu Oct 29 17:06:25 2009 (r1424)
@@ -13,11 +13,11 @@
#ifndef PISA_CDCTX_H
#define PISA_CDCTX_H
-#include "global.h"
-#include "conmgr.h"
-#include "ctrlhandler.h"
-#include "nat.h"
-#include "scheduler.h"
+#include "libpisa/global.h"
+#include "libpisa/conmgr.h"
+#include "libpisa/ctrlhandler.h"
+#include "libpisa/nat.h"
+#include "libpisa/scheduler.h"
/**
* data structure containing all of the necessary information about the
Modified: trunk/pisacd/cdderegister.h
==============================================================================
--- trunk/pisacd/cdderegister.h Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisacd/cdderegister.h Thu Oct 29 17:06:25 2009 (r1424)
@@ -6,8 +6,8 @@
#ifndef PISA_CDDEREGISTER_H
#define PISA_CDDEREGISTER_H
-#include "conmgr.h"
-#include "packet.h"
+#include "libpisa/conmgr.h"
+#include "libpisa/packet.h"
void pisa_client_disconnect_from_server(void *data, pisa_conmgr_entry *entry);
void pisa_client_disconnect_from_all_servers(void);
Modified: trunk/pisacd/cdheartbeat.c
==============================================================================
--- trunk/pisacd/cdheartbeat.c Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisacd/cdheartbeat.c Thu Oct 29 17:06:25 2009 (r1424)
@@ -15,7 +15,7 @@
#include "cdderegister.h"
#include "cdheartbeat.h"
#include "cdpending.h"
-#include "scheduler.h"
+#include "libpisa/scheduler.h"
/**
* Handle a HEARTBEAT_ACK packet from a server. Update the last received time
Modified: trunk/pisacd/cdheartbeat.h
==============================================================================
--- trunk/pisacd/cdheartbeat.h Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisacd/cdheartbeat.h Thu Oct 29 17:06:25 2009 (r1424)
@@ -6,7 +6,7 @@
#ifndef PISA_CDHEARTBEAT_H
#define PISA_CDHEARTBEAT_H
-#include "packet.h"
+#include "libpisa/packet.h"
#define PISA_HEARTBEAT_DELAY 10
Modified: trunk/pisacd/cdmain.c
==============================================================================
--- trunk/pisacd/cdmain.c Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisacd/cdmain.c Thu Oct 29 17:06:25 2009 (r1424)
@@ -14,8 +14,8 @@
#include <getopt.h>
#include <sys/utsname.h>
-#include "tunnel.h"
-#include "util.h"
+#include "libpisa/tunnel.h"
+#include "libpisa/util.h"
#include "cdconf.h"
#include "cdctx.h"
#include "cdtun.h"
@@ -23,11 +23,11 @@
#include "cdheartbeat.h"
#include "cdregister.h"
#include "cdpending.h"
-#include "ctrlhandler.h"
+#include "libpisa/ctrlhandler.h"
#include "cdservers.h"
-#include "pisaconf.h"
+#include "libpisa/pisaconf.h"
#include "cdconfhandlers.h"
-#include "scheduler.h"
+#include "libpisa/scheduler.h"
#include "cdtimeout.h"
extern pisa_conf_handle_func_set conf_handle_func_set;
Modified: trunk/pisacd/cdpending.c
==============================================================================
--- trunk/pisacd/cdpending.c Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisacd/cdpending.c Thu Oct 29 17:06:25 2009 (r1424)
@@ -12,11 +12,11 @@
#include <stdlib.h>
-#include "debug.h"
+#include "libpisa/debug.h"
#include "cdctx.h"
#include "cdpending.h"
-#include "util.h"
-#include "scheduler.h"
+#include "libpisa/util.h"
+#include "libpisa/scheduler.h"
static pisa_pending *hash_pending = NULL;
Modified: trunk/pisacd/cdpending.h
==============================================================================
--- trunk/pisacd/cdpending.h Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisacd/cdpending.h Thu Oct 29 17:06:25 2009 (r1424)
@@ -16,9 +16,9 @@
#include <sys/time.h>
#include <netinet/in.h>
-#include "conmgr.h"
-#include "scheduler.h"
-#include "uthash.h"
+#include "libpisa/conmgr.h"
+#include "libpisa/scheduler.h"
+#include "libpisa/uthash.h"
typedef enum {
PISA_PENDING_RESCHEDULE = 1,
Modified: trunk/pisacd/cdregister.c
==============================================================================
--- trunk/pisacd/cdregister.c Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisacd/cdregister.c Thu Oct 29 17:06:25 2009 (r1424)
@@ -11,7 +11,7 @@
* @date Oct. 2009
*/
-#include "tunnel.h"
+#include "libpisa/tunnel.h"
#include "cdctx.h"
#include "cdconf.h"
#include "cdheartbeat.h"
Modified: trunk/pisacd/cdregister.h
==============================================================================
--- trunk/pisacd/cdregister.h Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisacd/cdregister.h Thu Oct 29 17:06:25 2009 (r1424)
@@ -6,8 +6,8 @@
#ifndef PISA_CDREGISTER_H
#define PISA_CDREGISTER_H
-#include "conmgr.h"
-#include "packet.h"
+#include "libpisa/conmgr.h"
+#include "libpisa/packet.h"
void pisa_client_connect_to_server(pisa_conmgr_entry *entry);
Modified: trunk/pisacd/cdservers.c
==============================================================================
--- trunk/pisacd/cdservers.c Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisacd/cdservers.c Thu Oct 29 17:06:25 2009 (r1424)
@@ -13,8 +13,8 @@
#include "cdctx.h"
#include "cdregister.h"
#include "cdservers.h"
-#include "cfg.h"
-#include "nat.h"
+#include "libpisa/cfg.h"
+#include "libpisa/nat.h"
/**
* Add a server connection if it passes sanity checks. If it is a relay type
Modified: trunk/pisacd/cdservers.h
==============================================================================
--- trunk/pisacd/cdservers.h Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisacd/cdservers.h Thu Oct 29 17:06:25 2009 (r1424)
@@ -6,7 +6,7 @@
#ifndef PISA_CDSERVERS_H
#define PISA_CDSERVERS_H
-#include "conmgr.h"
+#include "libpisa/conmgr.h"
void pisa_servers_add_all(void);
void pisa_servers_add_services(pisa_conmgr_entry *entry);
Modified: trunk/pisacd/cdtimeout.c
==============================================================================
--- trunk/pisacd/cdtimeout.c Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisacd/cdtimeout.c Thu Oct 29 17:06:25 2009 (r1424)
@@ -13,7 +13,7 @@
#include "cdctx.h"
#include "cdconf.h"
#include "cdderegister.h"
-#include "scheduler.h"
+#include "libpisa/scheduler.h"
/**
* Check if a connection has been idle for too long and disconnect.
Modified: trunk/pisacd/cdtun.c
==============================================================================
--- trunk/pisacd/cdtun.c Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisacd/cdtun.c Thu Oct 29 17:06:25 2009 (r1424)
@@ -14,13 +14,13 @@
#include <netinet/ip.h>
#include <errno.h>
-#include "tunnel.h"
-#include "nat.h"
+#include "libpisa/tunnel.h"
+#include "libpisa/nat.h"
#include "cdctx.h"
#include "cdconf.h"
#include "cdderegister.h"
#include "cdregister.h"
-#include "conmgr.h"
+#include "libpisa/conmgr.h"
#include "cdpending.h"
#include "cdservers.h"
Modified: trunk/pisacd/pisacdconf.c
==============================================================================
--- trunk/pisacd/pisacdconf.c Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisacd/pisacdconf.c Thu Oct 29 17:06:25 2009 (r1424)
@@ -17,11 +17,11 @@
#include <stdlib.h>
#include <string.h>
-#include "debug.h"
-#include "pisaconf.h"
-#include "packet.h"
-#include "conmgr.h"
-#include "nat.h"
+#include "libpisa/debug.h"
+#include "libpisa/pisaconf.h"
+#include "libpisa/packet.h"
+#include "libpisa/conmgr.h"
+#include "libpisa/nat.h"
/**
* Parse a pisacdconf server line and send out a packet to the client daemon.
Modified: trunk/pisacd/pisaconftool.c
==============================================================================
--- trunk/pisacd/pisaconftool.c Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisacd/pisaconftool.c Thu Oct 29 17:06:25 2009 (r1424)
@@ -10,9 +10,9 @@
* @date Aug. 2009
*/
-#include "pisaconf.h"
+#include "libpisa/pisaconf.h"
#include "pisacdconf.h"
-#include "debug.h"
+#include "libpisa/debug.h"
const char *usage_text =
"Client options:\n"
Modified: trunk/pisasd/pisaconftool.c
==============================================================================
--- trunk/pisasd/pisaconftool.c Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisasd/pisaconftool.c Thu Oct 29 17:06:25 2009 (r1424)
@@ -11,9 +11,9 @@
* @date Aug. 2009
*/
-#include "pisaconf.h"
+#include "libpisa/pisaconf.h"
#include "pisasdconf.h"
-#include "debug.h"
+#include "libpisa/debug.h"
const char *usage_text=
"Server options:\n"
Modified: trunk/pisasd/pisasdconf.c
==============================================================================
--- trunk/pisasd/pisasdconf.c Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisasd/pisasdconf.c Thu Oct 29 17:06:25 2009 (r1424)
@@ -17,9 +17,9 @@
#include <stdlib.h>
#include <string.h>
-#include "debug.h"
-#include "global.h"
-#include "pisaconf.h"
+#include "libpisa/debug.h"
+#include "libpisa/global.h"
+#include "libpisa/pisaconf.h"
/**
* Parse a pisasdconf reload line and send out a packet to the server daemon.
Modified: trunk/pisasd/sdclients.c
==============================================================================
--- trunk/pisasd/sdclients.c Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisasd/sdclients.c Thu Oct 29 17:06:25 2009 (r1424)
@@ -12,9 +12,9 @@
#include "sdconf.h"
#include "sdctx.h"
-#include "cfg.h"
-#include "conmgr.h"
-#include "nat.h"
+#include "libpisa/cfg.h"
+#include "libpisa/conmgr.h"
+#include "libpisa/nat.h"
/**
* Compare two IPv4 addresses.
Modified: trunk/pisasd/sdconf.c
==============================================================================
--- trunk/pisasd/sdconf.c Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisasd/sdconf.c Thu Oct 29 17:06:25 2009 (r1424)
@@ -10,11 +10,11 @@
* @date Jan. 2009
*/
-#include "cfg.h"
-#include "debug.h"
-#include "hitlist.h"
+#include "libpisa/cfg.h"
+#include "libpisa/debug.h"
+#include "libpisa/hitlist.h"
#include "sdconf.h"
-#include "util.h"
+#include "libpisa/util.h"
#define PISASD_DEFAULT_DEBUGLEVEL "all"
#define PISASD_DEFAULT_IFNAME_ETH "eth0"
Modified: trunk/pisasd/sdconf.h
==============================================================================
--- trunk/pisasd/sdconf.h Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisasd/sdconf.h Thu Oct 29 17:06:25 2009 (r1424)
@@ -13,9 +13,9 @@
#ifndef PISA_SDCONF_H
#define PISA_SDCONF_H
-#include "global.h"
-#include "hitlist.h"
-#include "packet.h"
+#include "libpisa/global.h"
+#include "libpisa/hitlist.h"
+#include "libpisa/packet.h"
#define NAT_STRING_MAX 1024
/**
Modified: trunk/pisasd/sdctx.c
==============================================================================
--- trunk/pisasd/sdctx.c Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisasd/sdctx.c Thu Oct 29 17:06:25 2009 (r1424)
@@ -12,7 +12,7 @@
#include "sdctx.h"
#include "sdconf.h"
-#include "util.h"
+#include "libpisa/util.h"
/**
* sd_ctx contains all of the necessary information about the current
Modified: trunk/pisasd/sdctx.h
==============================================================================
--- trunk/pisasd/sdctx.h Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisasd/sdctx.h Thu Oct 29 17:06:25 2009 (r1424)
@@ -13,10 +13,10 @@
#ifndef PISA_SDCTX_H
#define PISA_SDCTX_H
-#include "conmgr.h"
-#include "ctrlhandler.h"
-#include "global.h"
-#include "nat.h"
+#include "libpisa/conmgr.h"
+#include "libpisa/ctrlhandler.h"
+#include "libpisa/global.h"
+#include "libpisa/nat.h"
/**
* data structure containing all of the necessary information about the
Modified: trunk/pisasd/sdderegister.h
==============================================================================
--- trunk/pisasd/sdderegister.h Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisasd/sdderegister.h Thu Oct 29 17:06:25 2009 (r1424)
@@ -15,7 +15,7 @@
#ifndef PISA_SDDEREGISTER_H
#define PISA_SDDEREGISTER_H
-#include "packet.h"
+#include "libpisa/packet.h"
/* handler for deregister tunnel control packets */
void pisa_recv_deregister(pisa_packet *pkt, struct sockaddr_in6 *addr);
Modified: trunk/pisasd/sdheartbeat.h
==============================================================================
--- trunk/pisasd/sdheartbeat.h Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisasd/sdheartbeat.h Thu Oct 29 17:06:25 2009 (r1424)
@@ -15,7 +15,7 @@
#ifndef PISA_SDHEARTBEAT_H
#define PISA_SDHEARTBEAT_H
-#include "packet.h"
+#include "libpisa/packet.h"
#define PISA_HEARTBEAT_DELAY 60
Modified: trunk/pisasd/sdmain.c
==============================================================================
--- trunk/pisasd/sdmain.c Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisasd/sdmain.c Thu Oct 29 17:06:25 2009 (r1424)
@@ -23,9 +23,9 @@
#include <errno.h>
#include <unistd.h>
-#include "cfg.h"
-#include "tunnel.h"
-#include "util.h"
+#include "libpisa/cfg.h"
+#include "libpisa/tunnel.h"
+#include "libpisa/util.h"
#include "sdconf.h"
#include "sdctx.h"
@@ -34,12 +34,12 @@
#include "sdnat.h"
#include "sdregister.h"
#include "sdtun.h"
-#include "ctrlhandler.h"
-#include "pisaconf.h"
-#include "scheduler.h"
+#include "libpisa/ctrlhandler.h"
+#include "libpisa/pisaconf.h"
+#include "libpisa/scheduler.h"
#ifdef CONFIG_PISA_LOGGING
-# include "log.h"
+# include "libpisa/log.h"
#endif
#ifdef CONFIG_PISA_PERFORMANCE
Modified: trunk/pisasd/sdnat.c
==============================================================================
--- trunk/pisasd/sdnat.c Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisasd/sdnat.c Thu Oct 29 17:06:25 2009 (r1424)
@@ -14,7 +14,7 @@
#include <stdio.h>
#include <fcntl.h>
-#include "debug.h"
+#include "libpisa/debug.h"
#include "sdctx.h"
#include "sdconf.h"
Modified: trunk/pisasd/sdregister.c
==============================================================================
--- trunk/pisasd/sdregister.c Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisasd/sdregister.c Thu Oct 29 17:06:25 2009 (r1424)
@@ -15,7 +15,7 @@
#include "sdconf.h"
#include "sdclients.h"
#include "sdheartbeat.h"
-#include "log.h"
+#include "libpisa/log.h"
/**
* send an RegisterAck to a client.
Modified: trunk/pisasd/sdregister.h
==============================================================================
--- trunk/pisasd/sdregister.h Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisasd/sdregister.h Thu Oct 29 17:06:25 2009 (r1424)
@@ -15,7 +15,7 @@
#ifndef PISA_SDREGISTER_H
#define PISA_SDREGISTER_H
-#include "packet.h"
+#include "libpisa/packet.h"
/* handler for register tunnel control packets */
void pisa_recv_register(pisa_packet *pkt, struct sockaddr_in6 *addr);
Modified: trunk/pisasd/sdtun.c
==============================================================================
--- trunk/pisasd/sdtun.c Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisasd/sdtun.c Thu Oct 29 17:06:25 2009 (r1424)
@@ -12,17 +12,17 @@
#include <netinet/ip.h>
-#include "conmgr.h"
-#include "hitlist.h"
+#include "libpisa/conmgr.h"
+#include "libpisa/hitlist.h"
#include "sdctx.h"
#include "sdtun.h"
#include "sdconf.h"
-#include "nat.h"
+#include "libpisa/nat.h"
#include "sdclients.h"
-#include "arp.h"
+#include "libpisa/arp.h"
#ifdef CONFIG_PISA_LOGGING
-# include "log.h"
+# include "libpisa/log.h"
#endif
/**
Modified: trunk/pisasd/sdtun.h
==============================================================================
--- trunk/pisasd/sdtun.h Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/pisasd/sdtun.h Thu Oct 29 17:06:25 2009 (r1424)
@@ -15,7 +15,7 @@
#ifndef PISA_SDTUN_H
#define PISA_SDTUN_H
-#include "packet.h"
+#include "libpisa/packet.h"
void pisa_sd_copy_from_sock_to_tun(void);
void pisa_sd_copy_from_tun_to_sock(void);
Modified: trunk/test/checkhipd.c
==============================================================================
--- trunk/test/checkhipd.c Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/test/checkhipd.c Thu Oct 29 17:06:25 2009 (r1424)
@@ -9,8 +9,8 @@
#include <netinet/in.h>
#include <arpa/inet.h>
-#include "packet.h"
-#include "util.h"
+#include "libpisa/packet.h"
+#include "libpisa/util.h"
int main(void)
{
Modified: trunk/test/getns.c
==============================================================================
--- trunk/test/getns.c Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/test/getns.c Thu Oct 29 17:06:25 2009 (r1424)
@@ -3,8 +3,8 @@
* All rights reserved.
*/
-#include "util.h"
-#include "global.h"
+#include "libpisa/util.h"
+#include "libpisa/global.h"
int main(void)
{
Modified: trunk/test/ifdefgw.c
==============================================================================
--- trunk/test/ifdefgw.c Thu Oct 29 17:05:27 2009 (r1423)
+++ trunk/test/ifdefgw.c Thu Oct 29 17:06:25 2009 (r1424)
@@ -14,8 +14,8 @@
#include <netinet/in.h>
#include <arpa/inet.h>
-#include "global.h"
-#include "debug.h"
+#include "libpisa/global.h"
+#include "libpisa/debug.h"
#include "iwlib.h"
#define FLAG_EXT 3 /* AND-Mask */
Other related posts:
- » [pisa-src] r1424 - in trunk: community-operator/co_client.c community-operator/co_common_packets.h community-operator/co_server.c community-operator/pisa_cert.c configure.ac pairing/accept.c pairing/common.c ... - Diego Biurrun
