[pisa-src] r1738 - in trunk: auto-update/config/split-file auto-update/files/etc/banner auto-update/files/etc/config/dhcp auto-update/files/etc/config/firewall auto-update/files/etc/config/network auto-update...
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Fri, 20 Nov 2009 16:30:17 +0100
Author: biurrun
Date: Fri Nov 20 16:30:16 2009
New Revision: 1738
Log:
The grand reformatting, chapter I.
Change tabs to spaces, remove all trailing whitespace;
proper consistent coding style for shell scripts.
Modified:
trunk/auto-update/config/split-file
trunk/auto-update/files/etc/banner
trunk/auto-update/files/etc/config/dhcp
trunk/auto-update/files/etc/config/firewall
trunk/auto-update/files/etc/config/network
trunk/auto-update/files/etc/config/system
trunk/auto-update/files/etc/config/wireless
trunk/auto-update/files/etc/hosts
trunk/auto-update/files/etc/ssh/ssh_config
trunk/auto-update/keys/distribute_keys
trunk/auto-update/package/auto-update/Makefile
trunk/auto-update/package/auto-update/files/auto-update
trunk/auto-update/package/auto-update/files/auto-update.conf
trunk/auto-update/package/auto-update/files/autostart
trunk/auto-update/package/auto-update/files/blink
trunk/auto-update/package/auto-update/files/get-firmware
trunk/auto-update/package/auto-update/files/get-mac
trunk/auto-update/package/auto-update/files/recursive-replace
trunk/auto-update/tarme
trunk/auto-update/tools/sendnode
trunk/auto-update/update-node
trunk/docs/Doxyfile
trunk/docs/architecture.txt
trunk/docs/packettype.txt
trunk/docs/porting_osx.txt
trunk/openwrt/create_config.sh
trunk/openwrt/files/etc/config/dhcp
trunk/openwrt/files/etc/config/dropbear
trunk/openwrt/files/etc/config/firewall
trunk/openwrt/files/etc/config/httpd
trunk/openwrt/files/etc/config/ntpclient
trunk/openwrt/files/etc/hip/hipd_config
trunk/openwrt/files/etc/hip/hosts
trunk/openwrt/files/etc/pisa/pisacd.conf
trunk/openwrt/package/hipl/Makefile
trunk/openwrt/package/hipl/files/hipd.init
trunk/openwrt/package/hipl/files/hipfw.init
trunk/openwrt/package/hipl/files/hipl.modules
trunk/openwrt/package/hipl/files/test/firewall.init
trunk/openwrt/package/hipl/files/test/firewall.start
trunk/openwrt/package/libxml2/Makefile
trunk/openwrt/package/pisa/Makefile
trunk/openwrt/package/pisa/files/pisabeacon.init
trunk/openwrt/package/pisa/files/pisacd.init
trunk/openwrt/package/pisa/files/pisasd.init
trunk/openwrt/router-configurations/eros/etc/config/wireless
trunk/openwrt/template-asus-wl500w/etc/config/wireless
trunk/openwrt/template-linksys-wrt160nl/etc/config/wireless
trunk/tools/NokiaN810_BEX_Perf.sh
trunk/tools/autoupdater.sh
trunk/tools/caphip.sh
trunk/tools/convenience-scripts/documentation.txt
trunk/tools/convenience-scripts/hipconnect.sh
trunk/tools/convenience-scripts/hipmyconfig.sh
trunk/tools/convenience-scripts/hipscreen
trunk/tools/convenience-scripts/hipswitchip.sh
trunk/tools/convenience-scripts/hiptest.sh
trunk/tools/convenience-scripts/tools.conf.template
trunk/tools/delroute.sh
trunk/tools/packaging/create-package.sh
trunk/tools/packaging/debbuild
trunk/tools/packaging/debian-init.d-pisacd
trunk/tools/packaging/debian-init.d-pisasd
trunk/tools/packaging/pisa-rpm.spec
trunk/tools/packaging/rh-init.d-pisacd
trunk/tools/packaging/rh-init.d-pisasd
trunk/tools/pisa_scripts.conf
trunk/tools/subversion/mailer.py.diff
trunk/tools/subversion/post-commit
trunk/tools/subversion/post-revprop-change
trunk/tools/subversion/pre-commit
trunk/tools/trigger-hipupdate.sh
trunk/tools/tunnel/screamer.rb
trunk/tools/writeff.pl
Modified: trunk/auto-update/config/split-file
==============================================================================
--- trunk/auto-update/config/split-file Fri Nov 20 15:19:06 2009 (r1737)
+++ trunk/auto-update/config/split-file Fri Nov 20 16:30:16 2009 (r1738)
@@ -4,9 +4,8 @@
# get NUM and NAMES
. mesh_population
-for NAME in $NAMES
-do
- grep -v NAMES mesh_population | grep -A $(( $NUM-1 )) $NAME >>
config_${NAME}
- source config_${NAME}
- mv config_${NAME} config_${MAC}
+for NAME in $NAMES; do
+ grep -v NAMES mesh_population | grep -A $(( $NUM-1 )) $NAME >>
config_${NAME}
+ source config_${NAME}
+ mv config_${NAME} config_${MAC}
done
Modified: trunk/auto-update/files/etc/banner
==============================================================================
--- trunk/auto-update/files/etc/banner Fri Nov 20 15:19:06 2009 (r1737)
+++ trunk/auto-update/files/etc/banner Fri Nov 20 16:30:16 2009 (r1738)
@@ -1,15 +1,15 @@
-
- ___ ____ _____ _
- | \| __| ___ | |___ ___| |_
+
+ ___ ____ _____ _
+ | \| __| ___ | |___ ___| |_
| | |__ | |___| | | | | -_|_ -| |
- |____/|____| |_|_|_|___|___|_|_|
- Version ||DS-VERSION||
+ |____/|____| |_|_|_|___|___|_|_|
+ Version ||DS-VERSION||
-----------------------------------------------------
Node : ||HOSTNAME||
LAN IP : ||LAN_IPADDR||
Wifi IP : ||WIFI_IPADDR||
Location : ||LOCATION||
-
+
MAC : ||MAC||
Wifi-MAC : ||WIFIMAC||
@@ -21,7 +21,7 @@
auto-update tool
* Please tell us if you have broken something
finding errors is usually more work
- than fixing them
+ than fixing them
* If you have questions, send a mail to:
heer@xxxxxxxxxxxxxxxxx
Modified: trunk/auto-update/files/etc/config/dhcp
==============================================================================
--- trunk/auto-update/files/etc/config/dhcp Fri Nov 20 15:19:06 2009
(r1737)
+++ trunk/auto-update/files/etc/config/dhcp Fri Nov 20 16:30:16 2009
(r1738)
@@ -1,16 +1,16 @@
config dhcp
- option interface lan
- option start 100
- option limit 150
- option leasetime 12h
+ option interface lan
+ option start 100
+ option limit 150
+ option leasetime 12h
config dhcp
- option interface wan
- option ignore 1
-
+ option interface wan
+ option ignore 1
+
config dhcp
- option interface ath0
- option start 100
- option limit 150
- option leasetime 12h
-
+ option interface ath0
+ option start 100
+ option limit 150
+ option leasetime 12h
+
Modified: trunk/auto-update/files/etc/config/firewall
==============================================================================
--- trunk/auto-update/files/etc/config/firewall Fri Nov 20 15:19:06 2009
(r1737)
+++ trunk/auto-update/files/etc/config/firewall Fri Nov 20 16:30:16 2009
(r1738)
@@ -3,39 +3,39 @@
# RULE SYNTAX:
#
# forward:<match>:<target>[:<port>]
-# - forwards all packets matched by <match> to <target>,
-# optionally changing the port to <port>
+# - forwards all packets matched by <match> to <target>,
+# optionally changing the port to <port>
#
# accept:<match>
-# - accepts all traffic matched by <match>
+# - accepts all traffic matched by <match>
#
# drop:<match>
-# - drops all traffic matched by <match>
+# - drops all traffic matched by <match>
#
#
# MATCHING OPTIONS:
#
# src=<ip>
-# - match the source ip <ip>
+# - match the source ip <ip>
#
# dest=<ip>
-# - match the destination ip <ip>
+# - match the destination ip <ip>
#
# proto=<proto>
-# - match the protocol by name or number
+# - match the protocol by name or number
#
# sport=<port(s)>
-# - match the source port(s), see below for syntax
+# - match the source port(s), see below for syntax
#
# dport=<port(s)>
-# - match the destination port(s), see below for syntax
+# - match the destination port(s), see below for syntax
#
#
#
# PORT SYNTAX:
#
# You can enter an arbitrary list of ports and port ranges in the following
format:
-# - 22,53,993,1000-1024
+# - 22,53,993,1000-1024
#
# If you don't set the protocol to tcp or udp, it will apply to both
#
Modified: trunk/auto-update/files/etc/config/network
==============================================================================
--- trunk/auto-update/files/etc/config/network Fri Nov 20 15:19:06 2009
(r1737)
+++ trunk/auto-update/files/etc/config/network Fri Nov 20 16:30:16 2009
(r1738)
@@ -1,18 +1,18 @@
# Copyright (C) 2006 OpenWrt.org
config interface loopback
- option ifname lo
- option proto static
- option ipaddr 127.0.0.1
- option netmask 255.0.0.0
+ option ifname lo
+ option proto static
+ option ipaddr 127.0.0.1
+ option netmask 255.0.0.0
config interface lan
- option ifname eth0
- option proto 'static'
- option ipaddr '||LAN_IPADDR||'
- option netmask '255.255.255.0'
- option gateway ''
- option dns ''
+ option ifname eth0
+ option proto 'static'
+ option ipaddr '||LAN_IPADDR||'
+ option netmask '255.255.255.0'
+ option gateway ''
+ option dns ''
config interface wifi
option ifname ath0
Modified: trunk/auto-update/files/etc/config/system
==============================================================================
--- trunk/auto-update/files/etc/config/system Fri Nov 20 15:19:06 2009
(r1737)
+++ trunk/auto-update/files/etc/config/system Fri Nov 20 16:30:16 2009
(r1738)
@@ -1,2 +1,2 @@
config system
- option hostname ||HOSTNAME||
+ option hostname ||HOSTNAME||
Modified: trunk/auto-update/files/etc/config/wireless
==============================================================================
--- trunk/auto-update/files/etc/config/wireless Fri Nov 20 15:19:06 2009
(r1737)
+++ trunk/auto-update/files/etc/config/wireless Fri Nov 20 16:30:16 2009
(r1738)
@@ -1,24 +1,24 @@
config wifi-device wifi0
- option type atheros
- option channel 6
+ option type atheros
+ option channel 6
# option diversity 1
# option txantenna 0
# option rxantenna 0
# option distance 2000
# disable radio to prevent an open ap after reflashing:
-# option disabled 1
+# option disabled 1
config wifi-iface
- option device wifi0
-# option network lan
-# option mode ap
- option mode adhoc
- option ssid ds-mesh
- option hidden 0
- # txpower was 15
- option txpower ||TXPOWER||
-
-# option bgscan enable
- option encryption none
+ option device wifi0
+# option network lan
+# option mode ap
+ option mode adhoc
+ option ssid ds-mesh
+ option hidden 0
+ # txpower was 15
+ option txpower ||TXPOWER||
+
+# option bgscan enable
+ option encryption none
Modified: trunk/auto-update/files/etc/hosts
==============================================================================
--- trunk/auto-update/files/etc/hosts Fri Nov 20 15:19:06 2009 (r1737)
+++ trunk/auto-update/files/etc/hosts Fri Nov 20 16:30:16 2009 (r1738)
@@ -2,7 +2,7 @@
#mesh nodes
192.168.5.1 ds-kolossus
-192.168.5.2 ds-goliath
+192.168.5.2 ds-goliath
192.168.5.3 ds-brutus
192.168.5.4 ds-godzilla
192.168.5.5 ds-titan
Modified: trunk/auto-update/files/etc/ssh/ssh_config
==============================================================================
--- trunk/auto-update/files/etc/ssh/ssh_config Fri Nov 20 15:19:06 2009
(r1737)
+++ trunk/auto-update/files/etc/ssh/ssh_config Fri Nov 20 16:30:16 2009
(r1738)
@@ -1,45 +1,45 @@
-# $OpenBSD: ssh_config,v 1.22 2006/05/29 12:56:33 dtucker Exp $
-
-# This is the ssh client system-wide configuration file. See
-# ssh_config(5) for more information. This file provides defaults for
-# users, and the values can be changed in per-user configuration files
-# or on the command line.
-
-# Configuration data is parsed as follows:
-# 1. command line options
-# 2. user-specific file
-# 3. system-wide file
-# Any configuration value is only changed the first time it is set.
-# Thus, host-specific definitions should be at the beginning of the
-# configuration file, and defaults at the end.
-
-# Site-wide defaults for some commonly used options. For a comprehensive
-# list of available options, their meanings and defaults, please see the
-# ssh_config(5) man page.
-
-# Host *
-# ForwardAgent no
-# ForwardX11 no
-# RhostsRSAAuthentication no
-# RSAAuthentication yes
-# PasswordAuthentication yes
-# HostbasedAuthentication no
-# GSSAPIAuthentication no
-# GSSAPIDelegateCredentials no
-# BatchMode no
-# CheckHostIP yes
-# AddressFamily any
-# ConnectTimeout 0
-# StrictHostKeyChecking ask
-# IdentityFile ~/.ssh/identity
-# IdentityFile ~/.ssh/id_rsa
-# IdentityFile ~/.ssh/id_dsa
- IdentityFile ~/.ssh/id_ds-||HOSTNAME2||
-# Port 22
-# Protocol 2,1
-# Cipher 3des
-# Ciphers
aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc
-# EscapeChar ~
-# Tunnel no
-# TunnelDevice any:any
-# PermitLocalCommand no
+# $OpenBSD: ssh_config,v 1.22 2006/05/29 12:56:33 dtucker Exp $
+
+# This is the ssh client system-wide configuration file. See
+# ssh_config(5) for more information. This file provides defaults for
+# users, and the values can be changed in per-user configuration files
+# or on the command line.
+
+# Configuration data is parsed as follows:
+# 1. command line options
+# 2. user-specific file
+# 3. system-wide file
+# Any configuration value is only changed the first time it is set.
+# Thus, host-specific definitions should be at the beginning of the
+# configuration file, and defaults at the end.
+
+# Site-wide defaults for some commonly used options. For a comprehensive
+# list of available options, their meanings and defaults, please see the
+# ssh_config(5) man page.
+
+# Host *
+# ForwardAgent no
+# ForwardX11 no
+# RhostsRSAAuthentication no
+# RSAAuthentication yes
+# PasswordAuthentication yes
+# HostbasedAuthentication no
+# GSSAPIAuthentication no
+# GSSAPIDelegateCredentials no
+# BatchMode no
+# CheckHostIP yes
+# AddressFamily any
+# ConnectTimeout 0
+# StrictHostKeyChecking ask
+# IdentityFile ~/.ssh/identity
+# IdentityFile ~/.ssh/id_rsa
+# IdentityFile ~/.ssh/id_dsa
+ IdentityFile ~/.ssh/id_ds-||HOSTNAME2||
+# Port 22
+# Protocol 2,1
+# Cipher 3des
+# Ciphers
aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc
+# EscapeChar ~
+# Tunnel no
+# TunnelDevice any:any
+# PermitLocalCommand no
Modified: trunk/auto-update/keys/distribute_keys
==============================================================================
--- trunk/auto-update/keys/distribute_keys Fri Nov 20 15:19:06 2009
(r1737)
+++ trunk/auto-update/keys/distribute_keys Fri Nov 20 16:30:16 2009
(r1738)
@@ -1,9 +1,7 @@
#!/bin/sh
NAMES="kolossus goliath brutus godzilla titan zeus"
-for NAME in $NAMES
- do
- echo "Sending Key to ${NAME}"
-
- scp id_ds-${NAME} id_ds-${NAME}.pub root@ds-${NAME}:/var/.ssh/
; echo "Done" &
- done
+for NAME in $NAMES; do
+ echo "Sending Key to ${NAME}"
+ scp id_ds-${NAME} id_ds-${NAME}.pub root@ds-${NAME}:/var/.ssh/ ; echo
"Done" &
+done
Modified: trunk/auto-update/package/auto-update/Makefile
==============================================================================
--- trunk/auto-update/package/auto-update/Makefile Fri Nov 20 15:19:06
2009 (r1737)
+++ trunk/auto-update/package/auto-update/Makefile Fri Nov 20 16:30:16
2009 (r1738)
@@ -1,4 +1,4 @@
-#
+#
# Copyright (C) 2006 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
@@ -19,36 +19,36 @@
include $(INCLUDE_DIR)/package.mk
define Package/auto-update
- SECTION:=utils
- CATEGORY:=Utilities
- TITLE:=A simple auto updater for mesh nodes
- URL:=http://www.bla.de
+ SECTION:=utils
+ CATEGORY:=Utilities
+ TITLE:=A simple auto updater for mesh nodes
+ URL:=http://www.bla.de
endef
define Package/auto-update/description
- This package provides a script that loads further scripts from a remote
server
+ This package provides a script that loads further scripts from a remote
server
endef
define Build/Compile
endef
define Package/auto-update/install
- $(INSTALL_DIR) $(1)/bin
- $(INSTALL_BIN) ./files/auto-update $(1)/bin/auto-update
- $(INSTALL_BIN) ./files/get-firmware $(1)/bin/get-firmware
- $(INSTALL_BIN) ./files/get-mac $(1)/bin/get-mac
- $(INSTALL_BIN) ./files/recursive-replace $(1)/bin/recursive-replace
- $(INSTALL_BIN) ./files/blink $(1)/bin/blink
- $(INSTALL_DIR) $(1)/etc
- $(INSTALL_DATA) ./files/auto-update.conf $(1)/etc/auto-update.conf
- $(INSTALL_DIR) $(1)/lib/modules/2.6.19.2
- $(INSTALL_DATA) ./files/proc_gpio.ko
$(1)/lib/modules/2.6.19.2/proc_gpio.ko
- $(INSTALL_DIR) $(1)/etc/modules.d
- $(INSTALL_DATA) ./files/70-auto-update $(1)/etc/modules.d/70-auto-update
- $(INSTALL_DIR) $(1)/etc/init.d
- $(INSTALL_BIN) ./files/autostart $(1)/etc/init.d/auto-update
- $(INSTALL_DIR) $(1)/etc/rc.d
- ln -sf ../init.d/auto-update $(1)/etc/rc.d/S55auto-update
+ $(INSTALL_DIR) $(1)/bin
+ $(INSTALL_BIN) ./files/auto-update $(1)/bin/auto-update
+ $(INSTALL_BIN) ./files/get-firmware $(1)/bin/get-firmware
+ $(INSTALL_BIN) ./files/get-mac $(1)/bin/get-mac
+ $(INSTALL_BIN) ./files/recursive-replace $(1)/bin/recursive-replace
+ $(INSTALL_BIN) ./files/blink $(1)/bin/blink
+ $(INSTALL_DIR) $(1)/etc
+ $(INSTALL_DATA) ./files/auto-update.conf $(1)/etc/auto-update.conf
+ $(INSTALL_DIR) $(1)/lib/modules/2.6.19.2
+ $(INSTALL_DATA) ./files/proc_gpio.ko $(1)/lib/modules/2.6.19.2/proc_gpio.ko
+ $(INSTALL_DIR) $(1)/etc/modules.d
+ $(INSTALL_DATA) ./files/70-auto-update $(1)/etc/modules.d/70-auto-update
+ $(INSTALL_DIR) $(1)/etc/init.d
+ $(INSTALL_BIN) ./files/autostart $(1)/etc/init.d/auto-update
+ $(INSTALL_DIR) $(1)/etc/rc.d
+ ln -sf ../init.d/auto-update $(1)/etc/rc.d/S55auto-update
endef
$(eval $(call BuildPackage,auto-update))
Modified: trunk/auto-update/package/auto-update/files/auto-update
==============================================================================
--- trunk/auto-update/package/auto-update/files/auto-update Fri Nov 20
15:19:06 2009 (r1737)
+++ trunk/auto-update/package/auto-update/files/auto-update Fri Nov 20
16:30:16 2009 (r1738)
@@ -11,42 +11,38 @@
# create log entry
date >> $LOG
-trap "echo \"Process aborted. Update failed!\" >> $LOG" INT TERM
+trap "echo \"Process aborted. Update failed!\" >> $LOG" INT TERM
# Create program state directory if mising
-if [ ! -e $STATE_DIR ]
-then
- mkdir $STATE_DIR
- #auto-uptate is being run for the first time!
+if [ ! -e $STATE_DIR ]; then
+ mkdir $STATE_DIR
+ #auto-uptate is being run for the first time!
fi
# Create program working directory if mising
-if [ ! -e $WORKING_DIR ]
-then
- mkdir $WORKING_DIR
- mkdir ${WORKING_DIR}/update
+if [ ! -e $WORKING_DIR ]; then
+ mkdir $WORKING_DIR
+ mkdir ${WORKING_DIR}/update
fi
# Get the latest config tree from the config server
-rm -rf ${WORKING_DIR}/update/*
-wget $WGET_PARAMS -O ${WORKING_DIR}/update/config.tar.gz ${CONFIG_SERVER}
+rm -rf ${WORKING_DIR}/update/*
+wget $WGET_PARAMS -O ${WORKING_DIR}/update/config.tar.gz ${CONFIG_SERVER}
-if [ "$?" -ne "0" ]
-then
- echo "Cannot reach config server ${CONFIG_SERVER}" >> $LOG
- exits
+if [ "$?" -ne "0" ]; then
+ echo "Cannot reach config server ${CONFIG_SERVER}" >> $LOG
+ exits
fi
# Untar the config file
cd ${WORKING_DIR}/update/
-echo "Untar config.tar.gz"
+echo "Untar config.tar.gz"
tar -xzf config.tar.gz
# Parameters for the update script
RESTART_SERVICES=""
REBOOT=FALSE
-
# Execute the update script
. ${WORKING_DIR}/update/update-node
@@ -56,17 +52,11 @@
rm -rf ${WORKING_DIR}/update/*
#retart services
-for SERVICE in $RESTART_SERVICES
-do
- echo "Restarting $SERVICE"
- /etc/init.d/${SERVICE} restart
+for SERVICE in $RESTART_SERVICES; do
+ echo "Restarting $SERVICE"
+ /etc/init.d/${SERVICE} restart
done
-if [ "$REBOOT" = "TRUE" ]
-then
- echo "REBOOTING"
+if [ "$REBOOT" = "TRUE" ]; then
+ echo "REBOOTING"
fi
-
-
-
-
Modified: trunk/auto-update/package/auto-update/files/auto-update.conf
==============================================================================
--- trunk/auto-update/package/auto-update/files/auto-update.conf Fri Nov
20 15:19:06 2009 (r1737)
+++ trunk/auto-update/package/auto-update/files/auto-update.conf Fri Nov
20 16:30:16 2009 (r1738)
@@ -6,7 +6,7 @@
# URL of the config archive
CONFIG_SERVER="http://192.168.5.100/auto-update/config.tar.gz";
-# Additional wget parameters
+# Additional wget parameters
# (must be supported by the target platform)
#WGET_PARAMS="-t 1 -T 2 --timeout=2"
WGET_PARAMS=" "
Modified: trunk/auto-update/package/auto-update/files/autostart
==============================================================================
--- trunk/auto-update/package/auto-update/files/autostart Fri Nov 20
15:19:06 2009 (r1737)
+++ trunk/auto-update/package/auto-update/files/autostart Fri Nov 20
16:30:16 2009 (r1738)
@@ -4,13 +4,13 @@
STOP=55
boot() {
- /bin/auto-update
+ /bin/auto-update
}
start() {
- /bin/auto-update
+ /bin/auto-update
}
stop() {
- echo "Can't stop. Stop is not applicable."
-}
\ No newline at end of file
+ echo "Can't stop. Stop is not applicable."
+}
Modified: trunk/auto-update/package/auto-update/files/blink
==============================================================================
--- trunk/auto-update/package/auto-update/files/blink Fri Nov 20 15:19:06
2009 (r1737)
+++ trunk/auto-update/package/auto-update/files/blink Fri Nov 20 16:30:16
2009 (r1738)
@@ -2,28 +2,24 @@
# blink
# Author: Tobias Heer <heer@xxxxxxxxxxxxxxxxx>
-#
-# This file does what the name suggests. It
-# lets some LED blink
+#
+# This file does what the name suggests. It lets some LED blink.
-if [ ! -n "$1" ]
-then
- echo "Select a pin please: 2 is Wi-Fi."
- exit 1
-fi
-
-SHORT=50000
-LONG=500000
-trap "echo 1 > /proc/gpio/${1}_dir; echo 0 > /proc/gpio/${1}_out; exit" INT
TERM EXIT
-while [ 1 ]
-do
- for duration in $SHORT
- do
- echo 1 > /proc/gpio/${1}_dir
- echo 1 > /proc/gpio/${1}_out
- usleep $duration
- echo 1 > /proc/gpio/${1}_dir
- echo 0 > /proc/gpio/${1}_out
- usleep $SHORT
- done
+if [ ! -n "$1" ]; then
+ echo "Select a pin please: 2 is Wi-Fi."
+ exit 1
+fi
+
+SHORT=50000
+LONG=500000
+trap "echo 1 > /proc/gpio/${1}_dir; echo 0 > /proc/gpio/${1}_out; exit" INT
TERM EXIT
+while [ 1 ]; do
+ for duration in $SHORT; do
+ echo 1 > /proc/gpio/${1}_dir
+ echo 1 > /proc/gpio/${1}_out
+ usleep $duration
+ echo 1 > /proc/gpio/${1}_dir
+ echo 0 > /proc/gpio/${1}_out
+ usleep $SHORT
+ done
done
Modified: trunk/auto-update/package/auto-update/files/get-firmware
==============================================================================
--- trunk/auto-update/package/auto-update/files/get-firmware Fri Nov 20
15:19:06 2009 (r1737)
+++ trunk/auto-update/package/auto-update/files/get-firmware Fri Nov 20
16:30:16 2009 (r1738)
@@ -1,4 +1,5 @@
#! /bin/sh
+
SERVER_URL="http://192.168.5.100";
echo "Getting new firmware from $SERVER_URL";
wget ${SERVER_URL}/openwrt-atheros-2.6-vmlinux.lzma
Modified: trunk/auto-update/package/auto-update/files/get-mac
==============================================================================
--- trunk/auto-update/package/auto-update/files/get-mac Fri Nov 20 15:19:06
2009 (r1737)
+++ trunk/auto-update/package/auto-update/files/get-mac Fri Nov 20 16:30:16
2009 (r1738)
@@ -1,12 +1,12 @@
#! /bin/sh
-# get-mac
+# get-mac
# Author: Tobias Heer <heer@xxxxxxxxxxxxxxxxx>
#
# Get the mac of the current system
# Starting position of the MAC address
MACPOS1=39
-MACPOS2=$(($MACPOS1+20))
+MACPOS2=$(($MACPOS1 + 20))
INTERFACE="eth0"
MACSTRING="HWaddr"
Modified: trunk/auto-update/package/auto-update/files/recursive-replace
==============================================================================
--- trunk/auto-update/package/auto-update/files/recursive-replace Fri Nov
20 15:19:06 2009 (r1737)
+++ trunk/auto-update/package/auto-update/files/recursive-replace Fri Nov
20 16:30:16 2009 (r1738)
@@ -1,9 +1,9 @@
#!/bin/sh
# recursive-replace
# Author: Tobias Heer <heer@xxxxxxxxxxxxxxxxx>
-#
+#
# This files replaces the first with the second argument.
-# The replacement is done in all files below the current
+# The replacement is done in all files below the current
# directory
echo " Replace $1 with $2"
Modified: trunk/auto-update/tarme
==============================================================================
--- trunk/auto-update/tarme Fri Nov 20 15:19:06 2009 (r1737)
+++ trunk/auto-update/tarme Fri Nov 20 16:30:16 2009 (r1738)
@@ -1,2 +1,3 @@
#!/bin/sh
+
tar -czf bin/config.tar.gz config files update-node
Modified: trunk/auto-update/tools/sendnode
==============================================================================
--- trunk/auto-update/tools/sendnode Fri Nov 20 15:19:06 2009 (r1737)
+++ trunk/auto-update/tools/sendnode Fri Nov 20 16:30:16 2009 (r1738)
@@ -2,9 +2,8 @@
NODES="1 2 3 4 5 6"
-for NODE in $NODES
- do
- echo "Sending \"${1}\" to node 192.168.5.${NODE}"
- ssh root@xxxxxxxxxx${NODE} "${1}" > log_${NODE} &
- echo "Done"
- done
+for NODE in $NODES; do
+ echo "Sending \"${1}\" to node 192.168.5.${NODE}"
+ ssh root@xxxxxxxxxx${NODE} "${1}" > log_${NODE} &
+ echo "Done"
+done
Modified: trunk/auto-update/update-node
==============================================================================
--- trunk/auto-update/update-node Fri Nov 20 15:19:06 2009 (r1737)
+++ trunk/auto-update/update-node Fri Nov 20 16:30:16 2009 (r1738)
@@ -3,20 +3,18 @@
# Exception handling
trap "echo \"Update not sucessfull\" >> $LOG" INT TERM
-# Get latest version
+# Get latest version
CURR_VERSION=39
LAST_VERSION=0
-if [ -e ${STATE_DIR}/version.txt ]
- then
- LAST_VERSION=$(cat ${STATE_DIR}/version.txt)
+if [ -e ${STATE_DIR}/version.txt ]; then
+ LAST_VERSION=$(cat ${STATE_DIR}/version.txt)
fi
echo "Last version is $LAST_VERSION"
-if [ $CURR_VERSION -le $LAST_VERSION ]
- then
- echo "Latest version installed"
- exit 0
+if [ $CURR_VERSION -le $LAST_VERSION ]; then
+ echo "Latest version installed"
+ exit 0
fi
echo "Current version is $CURR_VERSION"
@@ -24,36 +22,34 @@
# We need to update!
-# Start blinking. Saving the pid is a dirty workaround.
+# Start blinking. Saving the pid is a dirty workaround.
# Improve it if you can.
blink 2 &
jobs -p > /tmp/blink-temp
-BLINK_PID=$( tail -n 1 /tmp/blink-temp )
+BLINK_PID=$(tail -n 1 /tmp/blink-temp)
rm /tmp/blink-temp
# create log dir if not already there
mkdir /var/log
#make /var permanent if it is a symlink to /tmp
-if [ -L /var ]
-then
- rm /var
- mkdir /var
- ln -s /tmp/lock /var/lock
- ln -s /tmp/run /var/run
- ln -s /tmp/spool/ /var/spool
- mv /tmp/auto-update/ /var/auto-update
+if [ -L /var ]; then
+ rm /var
+ mkdir /var
+ ln -s /tmp/lock /var/lock
+ ln -s /tmp/run /var/run
+ ln -s /tmp/spool/ /var/spool
+ mv /tmp/auto-update/ /var/auto-update
fi
# start updating
-MAC=$( get-mac )
+MAC=$(get-mac)
echo "Our MAC address: ${MAC}"
-if [ ! -e ${WORKING_DIR}/update/config/config_${MAC} ]
- then
- echo ${WORKING_DIR}/update/config/config_${MAC}" does not exit"
- echo "Config file does not exist" >> $LOG
- exit 1
+if [ ! -e ${WORKING_DIR}/update/config/config_${MAC} ]; then
+ echo ${WORKING_DIR}/update/config/config_${MAC}" does not exit"
+ echo "Config file does not exist" >> $LOG
+ exit 1
fi
. ${WORKING_DIR}/update/config/config_${MAC}
@@ -61,9 +57,8 @@
cd ${WORKING_DIR}/update/
echo "Reading replacements in ${WORKING_DIR}/update/files"
-for REPLACE in $( cut -d = -f 1 ${WORKING_DIR}/update/config/config_${MAC} )
- do
- recursive-replace "${REPLACE}" "$( eval "echo \${$REPLACE}" )"
+for REPLACE in $(cut -d = -f 1 ${WORKING_DIR}/update/config/config_${MAC}); do
+ recursive-replace "${REPLACE}" "$(eval "echo \${$REPLACE}")"
done
## - add stuff here
@@ -89,8 +84,7 @@
echo $CURR_VERSION > ${STATE_DIR}/version.txt
-
-# stop blinking
+# stop blinking
kill $BLINK_PID
echo "DONE"
Modified: trunk/docs/Doxyfile
==============================================================================
--- trunk/docs/Doxyfile Fri Nov 20 15:19:06 2009 (r1737)
+++ trunk/docs/Doxyfile Fri Nov 20 16:30:16 2009 (r1738)
@@ -14,211 +14,211 @@
# Project related configuration options
#---------------------------------------------------------------------------
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
+# iconv built into libc) for the transcoding. See
# http://www.gnu.org/software/libiconv for the list of possible encodings.
DOXYFILE_ENCODING = UTF-8
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project.
PROJECT_NAME = Pisa - P2P WiFi Internet Sharing Architecture
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
+# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER =
+PROJECT_NUMBER =
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
+# base path where the generated documentation will be put.
+# If a relative path is entered, it will be relative to the location
# where doxygen was started. If left blank the current directory will be used.
OUTPUT_DIRECTORY = doxygen
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
+# 4096 sub-directories (in 2 levels) under the output directory of each output
+# format and will distribute the generated files over these directories.
+# Enabling this option can be useful when feeding doxygen a huge amount of
+# source files, where putting all generated files in the same directory would
# otherwise cause performance problems for the file system.
CREATE_SUBDIRS = NO
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek,
-# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages),
-# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish,
-# Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish,
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# The default language is English, other supported languages are:
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
+# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek,
+# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish,
+# Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish,
# and Ukrainian.
OUTPUT_LANGUAGE = English
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
+# include brief member descriptions after the members that are listed in
+# the file and class documentation (similar to JavaDoc).
# Set to NO to disable this.
BRIEF_MEMBER_DESC = YES
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed
description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
+# the brief description of a member or function before the detailed
description.
+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
# brief descriptions will be completely suppressed.
REPEAT_BRIEF = YES
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
+# This tag implements a quasi-intelligent brief description abbreviator
+# that is used to form the text in various listings. Each string
+# in this list, if found as the leading text of the brief description, will be
+# stripped from the text and the result after processing the whole list, is
+# used as the annotated text. Otherwise, the brief description is used as-is.
+# If left blank, the following values are used ("$name" is automatically
+# replaced with the name of the entity): "The $name class" "The $name widget"
+# "The $name file" "is" "provides" "specifies" "contains"
# "represents" "a" "an" "the"
-ABBREVIATE_BRIEF =
+ABBREVIATE_BRIEF =
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# Doxygen will generate a detailed section even if there is only a brief
# description.
ALWAYS_DETAILED_SEC = NO
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and
assignment
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
# operators of the base classes will not be shown.
INLINE_INHERITED_MEMB = NO
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
+# path before files name in the file list and in the header files. If set
# to NO the shortest path that makes the file name unique will be used.
FULL_PATH_NAMES = YES
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
+# can be used to strip a user-defined part of the path. Stripping is
+# only done if one of the specified strings matches the left-hand part of
+# the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the
# path to strip.
-STRIP_FROM_PATH =
+STRIP_FROM_PATH =
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
+# the path mentioned in the documentation of a class, which tells
+# the reader which header file to include in order to use a class.
+# If left blank only the name of the header file containing the class
+# definition is used. Otherwise one should specify the include paths that
# are normally passed to the compiler using the -I flag.
-STRIP_FROM_INC_PATH =
+STRIP_FROM_INC_PATH =
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful is your file systems
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
+# (but less readable) file names. This can be useful is your file systems
# doesn't support long names like on DOS, Mac, or CD-ROM.
SHORT_NAMES = NO
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like regular Qt-style comments
+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
+# will interpret the first line (until the first dot) of a JavaDoc-style
+# comment as the brief description. If set to NO, the JavaDoc
+# comments will behave just like regular Qt-style comments
# (thus requiring an explicit @brief command for a brief description.)
JAVADOC_AUTOBRIEF = NO
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
-# interpret the first line (until the first dot) of a Qt-style
-# comment as the brief description. If set to NO, the comments
-# will behave just like regular Qt-style comments (thus requiring
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
+# interpret the first line (until the first dot) of a Qt-style
+# comment as the brief description. If set to NO, the comments
+# will behave just like regular Qt-style comments (thus requiring
# an explicit \brief command for a brief description.)
QT_AUTOBRIEF = NO
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
+# comments) as a brief description. This used to be the default behaviour.
+# The new default is to treat a multi-line C++ comment block as a detailed
# description. Set this tag to YES if you prefer the old behaviour instead.
MULTILINE_CPP_IS_BRIEF = NO
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen
+# If the DETAILS_AT_TOP tag is set to YES then Doxygen
# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member
+# If set to NO, the detailed description appears after the member
# documentation.
DETAILS_AT_TOP = NO
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
+# member inherits the documentation from any documented member that it
# re-implements.
INHERIT_DOCS = YES
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-# a new page for each member. If set to NO, the documentation of a member will
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
+# a new page for each member. If set to NO, the documentation of a member will
# be part of the file/class/namespace that contains it.
SEPARATE_MEMBER_PAGES = NO
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
# Doxygen uses this value to replace tabs by spaces in code fragments.
TAB_SIZE = 8
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
+# This tag can be used to specify a number of aliases that acts
+# as commands in the documentation. An alias has the form "name=value".
+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
+# put the command \sideeffect (or @sideeffect) in the documentation, which
+# will result in a user-defined paragraph with heading "Side Effects:".
# You can put \n's in the value part of an alias to insert newlines.
-ALIASES =
+ALIASES =
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
-# sources only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
+# sources only. Doxygen will then generate output that is more tailored for C.
+# For instance, some of the names that are used will be different. The list
# of all members will be omitted, etc.
OPTIMIZE_OUTPUT_FOR_C = YES
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for
-# Java. For instance, namespaces will be presented as packages, qualified
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
+# sources only. Doxygen will then generate output that is more tailored for
+# Java. For instance, namespaces will be presented as packages, qualified
# scopes will look different, etc.
OPTIMIZE_OUTPUT_JAVA = NO
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources only. Doxygen will then generate output that is more tailored for
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources only. Doxygen will then generate output that is more tailored for
# Fortran.
OPTIMIZE_FOR_FORTRAN = NO
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for
# VHDL.
OPTIMIZE_OUTPUT_VHDL = NO
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should
-# set this tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string);
v.s.
-# func(std::string) {}). This also make the inheritance and collaboration
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should
+# set this tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
+# func(std::string) {}). This also make the inheritance and collaboration
# diagrams that involve STL classes more complete and accurate.
BUILTIN_STL_SUPPORT = NO
@@ -228,33 +228,33 @@
CPP_CLI_SUPPORT = NO
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
-# Doxygen will parse them like normal C++ but will assume all classes use
public
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
+# Doxygen will parse them like normal C++ but will assume all classes use
public
# instead of private inheritance when no explicit protection keyword is
present.
SIP_SUPPORT = NO
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
# all members of a group must be documented explicitly.
DISTRIBUTE_GROUP_DOC = NO
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
+# the same type (for instance a group of public functions) to be put as a
+# subgroup of that type (e.g. under the Public Functions section). Set it to
+# NO to prevent subgrouping. Alternatively, this can be done per class using
# the \nosubgrouping command.
SUBGROUPING = YES
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
-# is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a
file,
-# namespace, or class. And the struct will be named TypeS. This can typically
-# be useful for C code in case the coding convention dictates that all
compound
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
+# is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically
+# be useful for C code in case the coding convention dictates that all compound
# types are typedef'ed and only the typedef is referenced, never the tag name.
TYPEDEF_HIDES_STRUCT = NO
@@ -263,254 +263,254 @@
# Build related configuration options
#---------------------------------------------------------------------------
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available.
+# Private class members and static file members will be hidden unless
# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
EXTRACT_ALL = YES
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
# will be included in the documentation.
EXTRACT_PRIVATE = NO
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
+# If the EXTRACT_STATIC tag is set to YES all static members of a file
# will be included in the documentation.
EXTRACT_STATIC = YES
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
+# defined locally in source files will be included in the documentation.
# If set to NO only classes defined in header files are included.
EXTRACT_LOCAL_CLASSES = YES
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
+# This flag is only useful for Objective-C code. When set to YES local
+# methods, which are defined in the implementation section but not in
+# the interface are included in the documentation.
# If set to NO (the default) only methods in the interface are included.
EXTRACT_LOCAL_METHODS = NO
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base
-# name of the file that contains the anonymous namespace. By default
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base
+# name of the file that contains the anonymous namespace. By default
# anonymous namespace are hidden.
EXTRACT_ANON_NSPACES = NO
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
+# undocumented members of documented classes, files or namespaces.
+# If set to NO (the default) these members will be included in the
+# various overviews, but no documentation section is generated.
# This option has no effect if EXTRACT_ALL is enabled.
HIDE_UNDOC_MEMBERS = NO
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy.
+# If set to NO (the default) these classes will be included in the various
# overviews. This option has no effect if EXTRACT_ALL is enabled.
HIDE_UNDOC_CLASSES = NO
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
+# friend (class|struct|union) declarations.
+# If set to NO (the default) these declarations will be included in the
# documentation.
HIDE_FRIEND_COMPOUNDS = NO
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
+# documentation blocks found inside the body of a function.
+# If set to NO (the default) these blocks will be appended to the
# function's detailed documentation block.
HIDE_IN_BODY_DOCS = NO
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
+# The INTERNAL_DOCS tag determines if documentation
+# that is typed after a \internal command is included. If the tag is set
+# to NO (the default) then the documentation will be excluded.
# Set it to YES to include the internal documentation.
INTERNAL_DOCS = NO
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
+# file names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
# and Mac users are advised to set this option to NO.
CASE_SENSE_NAMES = YES
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
+# will show members with their full class and namespace scopes in the
# documentation. If set to YES the scope will be hidden.
HIDE_SCOPE_NAMES = NO
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the
documentation
+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
+# will put a list of the files that are included by a file in the documentation
# of that file.
SHOW_INCLUDE_FILES = YES
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
# is inserted in the documentation for inline members.
INLINE_INFO = YES
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
+# will sort the (detailed) documentation of file and class members
+# alphabetically by member name. If set to NO the members will appear in
# declaration order.
SORT_MEMBER_DOCS = YES
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
+# brief documentation of file, namespace and class members alphabetically
+# by member name. If set to NO (the default) the members will appear in
# declaration order.
SORT_BRIEF_DOCS = NO
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
-# hierarchy of group names into alphabetical order. If set to NO (the default)
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
+# hierarchy of group names into alphabetical order. If set to NO (the default)
# the group names will appear in their defined order.
SORT_GROUP_NAMES = NO
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
+# sorted by fully-qualified names, including namespaces. If set to
+# NO (the default), the class list will be sorted only by class name,
+# not including the namespace part.
# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
+# Note: This option applies only to the class list, not to the
# alphabetical list.
SORT_BY_SCOPE_NAME = NO
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
+# The GENERATE_TODOLIST tag can be used to enable (YES) or
+# disable (NO) the todo list. This list is created by putting \todo
# commands in the documentation.
GENERATE_TODOLIST = YES
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
+# The GENERATE_TESTLIST tag can be used to enable (YES) or
+# disable (NO) the test list. This list is created by putting \test
# commands in the documentation.
GENERATE_TESTLIST = YES
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
+# The GENERATE_BUGLIST tag can be used to enable (YES) or
+# disable (NO) the bug list. This list is created by putting \bug
# commands in the documentation.
GENERATE_BUGLIST = YES
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
+# disable (NO) the deprecated list. This list is created by putting
# \deprecated commands in the documentation.
GENERATE_DEPRECATEDLIST= YES
-# The ENABLED_SECTIONS tag can be used to enable conditional
+# The ENABLED_SECTIONS tag can be used to enable conditional
# documentation sections, marked by \if sectionname ... \endif.
-ENABLED_SECTIONS =
+ENABLED_SECTIONS =
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or define consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and defines in the
-# documentation can be controlled using \showinitializer or \hideinitializer
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
+# the initial value of a variable or define consists of for it to appear in
+# the documentation. If the initializer consists of more lines than specified
+# here it will be hidden. Use a value of 0 to hide initializers completely.
+# The appearance of the initializer of individual variables and defines in the
+# documentation can be controlled using \showinitializer or \hideinitializer
# command in the documentation regardless of this setting.
MAX_INITIALIZER_LINES = 30
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
+# at the bottom of the documentation of classes and structs. If set to YES the
# list will mention the files that were used to generate the documentation.
SHOW_USED_FILES = YES
-# If the sources in your project are distributed over multiple directories
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory
hierarchy
+# If the sources in your project are distributed over multiple directories
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory
hierarchy
# in the documentation. The default is NO.
SHOW_DIRECTORIES = NO
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically
from
-# the version control system). Doxygen will invoke the program by executing
(via
-# popen()) the command <command> <input-file>, where <command> is the value of
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
-# provided by doxygen. Whatever the program writes to standard output
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically
from
+# the version control system). Doxygen will invoke the program by executing
(via
+# popen()) the command <command> <input-file>, where <command> is the value of
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
+# provided by doxygen. Whatever the program writes to standard output
# is used as the file version. See the manual for examples.
-FILE_VERSION_FILTER =
+FILE_VERSION_FILTER =
#---------------------------------------------------------------------------
# configuration options related to warning and progress messages
#---------------------------------------------------------------------------
-# The QUIET tag can be used to turn on/off the messages that are generated
+# The QUIET tag can be used to turn on/off the messages that are generated
# by doxygen. Possible values are YES and NO. If left blank NO is used.
QUIET = NO
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated by doxygen. Possible values are YES and NO. If left blank
# NO is used.
WARNINGS = YES
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
# automatically be disabled.
WARN_IF_UNDOCUMENTED = YES
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some
+# parameters in a documented function, or documenting parameters that
# don't exist or using markup commands wrongly.
WARN_IF_DOC_ERROR = YES
-# This WARN_NO_PARAMDOC option can be abled to get warnings for
-# functions that are documented, but have no documentation for their
parameters
-# or return value. If set to NO (the default) doxygen will only warn about
-# wrong or incomplete parameter documentation, but not about the absence of
+# This WARN_NO_PARAMDOC option can be abled to get warnings for
+# functions that are documented, but have no documentation for their parameters
+# or return value. If set to NO (the default) doxygen will only warn about
+# wrong or incomplete parameter documentation, but not about the absence of
# documentation.
WARN_NO_PARAMDOC = NO
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text. Optionally the format may contain
-# $version, which will be replaced by the version of the file (if it could
+# The WARN_FORMAT tag determines the format of the warning messages that
+# doxygen can produce. The string should contain the $file, $line, and $text
+# tags, which will be replaced by the file and line number from which the
+# warning originated and the warning text. Optionally the format may contain
+# $version, which will be replaced by the version of the file (if it could
# be obtained via FILE_VERSION_FILTER)
WARN_FORMAT = "$file:$line: $text"
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
+# The WARN_LOGFILE tag can be used to specify a file to which warning
+# and error messages should be written. If left blank the output is written
# to stderr.
-WARN_LOGFILE =
+WARN_LOGFILE =
#---------------------------------------------------------------------------
# configuration options related to the input files
#---------------------------------------------------------------------------
-# The INPUT tag can be used to specify the files and/or directories that
contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
+# The INPUT tag can be used to specify the files and/or directories that
contain
+# documented source files. You may enter file names like "myfile.cpp" or
+# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
INPUT = ../pisacd \
@@ -519,104 +519,104 @@
../pairing \
../pisasd \
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-# also the default input encoding. Doxygen uses libiconv (or the iconv built
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
+# also the default input encoding. Doxygen uses libiconv (or the iconv built
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
# the list of possible encodings.
INPUT_ENCODING = UTF-8
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
*.hxx
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
+# blank the following patterns are tested:
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
-FILE_PATTERNS =
+FILE_PATTERNS =
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
+# should be searched for input files as well. Possible values are YES and NO.
# If left blank NO is used.
RECURSIVE = NO
-# The EXCLUDE tag can be used to specify files and/or directories that should
-# excluded from the INPUT source files. This way you can easily exclude a
+# The EXCLUDE tag can be used to specify files and/or directories that should
+# excluded from the INPUT source files. This way you can easily exclude a
# subdirectory from a directory tree whose root is specified with the INPUT
tag.
-EXCLUDE =
+EXCLUDE =
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
-# directories that are symbolic links (a Unix filesystem feature) are excluded
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
+# directories that are symbolic links (a Unix filesystem feature) are excluded
# from the input.
EXCLUDE_SYMLINKS = NO
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories. Note that the wildcards are matched
-# against the file with absolute path, so to exclude all test directories
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories. Note that the wildcards are matched
+# against the file with absolute path, so to exclude all test directories
# for example use the pattern */test/*
-EXCLUDE_PATTERNS =
+EXCLUDE_PATTERNS =
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
# AClass::ANamespace, ANamespace::*Test
-EXCLUDE_SYMBOLS =
+EXCLUDE_SYMBOLS =
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
+# The EXAMPLE_PATH tag can be used to specify one or more files or
+# directories that contain example code fragments that are included (see
# the \include command).
-EXAMPLE_PATH =
+EXAMPLE_PATH =
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
+# and *.h) to filter out the source-files in the directories. If left
# blank all files are included.
-EXAMPLE_PATTERNS =
+EXAMPLE_PATTERNS =
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude
+# commands irrespective of the value of the RECURSIVE tag.
# Possible values are YES and NO. If left blank NO is used.
EXAMPLE_RECURSIVE = NO
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
+# The IMAGE_PATH tag can be used to specify one or more files or
+# directories that contain image that are included in the documentation (see
# the \image command).
-IMAGE_PATH =
+IMAGE_PATH =
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output. If FILTER_PATTERNS is specified, this tag will be
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command <filter> <input-file>, where <filter>
+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
+# input file. Doxygen will then use the output that the filter program writes
+# to standard output. If FILTER_PATTERNS is specified, this tag will be
# ignored.
-INPUT_FILTER =
+INPUT_FILTER =
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form:
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
# is applied to all files.
-FILTER_PATTERNS =
+FILTER_PATTERNS =
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will be used to filter the input files when producing source
# files to browse (i.e. when SOURCE_BROWSER is set to YES).
FILTER_SOURCE_FILES = NO
@@ -625,32 +625,32 @@
# configuration options related to source browsing
#---------------------------------------------------------------------------
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these
sources.
-# Note: To get rid of all source code in the generated output, make sure also
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
+# be generated. Documented entities will be cross-referenced with these
sources.
+# Note: To get rid of all source code in the generated output, make sure also
# VERBATIM_HEADERS is set to NO.
SOURCE_BROWSER = YES
-# Setting the INLINE_SOURCES tag to YES will include the body
+# Setting the INLINE_SOURCES tag to YES will include the body
# of functions and classes directly in the documentation.
INLINE_SOURCES = NO
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
+# doxygen to hide any special comment blocks from generated source code
# fragments. Normal C and C++ comments will always remain visible.
STRIP_CODE_COMMENTS = YES
-# If the REFERENCED_BY_RELATION tag is set to YES (the default)
-# then for each documented function all documented
+# If the REFERENCED_BY_RELATION tag is set to YES (the default)
+# then for each documented function all documented
# functions referencing it will be listed.
REFERENCED_BY_RELATION = NO
-# If the REFERENCES_RELATION tag is set to YES (the default)
-# then for each documented function all documented entities
+# If the REFERENCES_RELATION tag is set to YES (the default)
+# then for each documented function all documented entities
# called/used by that function will be listed.
REFERENCES_RELATION = NO
@@ -662,16 +662,16 @@
REFERENCES_LINK_SOURCE = YES
-# If the USE_HTAGS tag is set to YES then the references to source code
-# will point to the HTML generated by the htags(1) tool instead of doxygen
-# built-in source browser. The htags tool is part of GNU's global source
-# tagging system (see http://www.gnu.org/software/global/global.html). You
+# If the USE_HTAGS tag is set to YES then the references to source code
+# will point to the HTML generated by the htags(1) tool instead of doxygen
+# built-in source browser. The htags tool is part of GNU's global source
+# tagging system (see http://www.gnu.org/software/global/global.html). You
# will need version 4.8.6 or higher.
USE_HTAGS = NO
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
+# will generate a verbatim copy of the header file for each class for
# which an include is specified. Set to NO to disable this.
VERBATIM_HEADERS = YES
@@ -680,166 +680,166 @@
# configuration options related to the alphabetical class index
#---------------------------------------------------------------------------
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
+# of all compounds will be generated. Enable this if the project
# contains a lot of classes, structs, unions or interfaces.
ALPHABETICAL_INDEX = NO
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
# in which this list will be split (can be a number in the range [1..20])
COLS_IN_ALPHA_INDEX = 5
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
+# In case all classes in a project start with a common prefix, all
+# classes will be put under the same header in the alphabetical index.
+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
# should be ignored while generating the index headers.
-IGNORE_PREFIX =
+IGNORE_PREFIX =
#---------------------------------------------------------------------------
# configuration options related to the HTML output
#---------------------------------------------------------------------------
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
# generate HTML output.
GENERATE_HTML = YES
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
# put in front of it. If left blank `html' will be used as the default path.
HTML_OUTPUT = html
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
# doxygen will generate files with .html extension.
HTML_FILE_EXTENSION = .html
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
+# The HTML_HEADER tag can be used to specify a personal HTML header for
+# each generated HTML page. If it is left blank doxygen will generate a
# standard header.
-HTML_HEADER =
+HTML_HEADER =
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
+# each generated HTML page. If it is left blank doxygen will generate a
# standard footer.
-HTML_FOOTER =
+HTML_FOOTER =
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet. Note that doxygen will try to copy
-# the style sheet file to the HTML output directory, so don't put your own
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
+# style sheet that is used by each HTML page. It can be used to
+# fine-tune the look of the HTML output. If the tag is left blank doxygen
+# will generate a default style sheet. Note that doxygen will try to copy
+# the style sheet file to the HTML output directory, so don't put your own
# stylesheet in the HTML output directory as well, or it will be erased!
-HTML_STYLESHEET =
+HTML_STYLESHEET =
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
+# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
+# files or namespaces will be aligned in HTML using tables. If set to
# NO a bullet list will be used.
HTML_ALIGN_MEMBERS = YES
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
+# will be generated that can be used as input for tools like the
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
# of the generated HTML documentation.
GENERATE_HTMLHELP = NO
-# If the GENERATE_DOCSET tag is set to YES, additional index files
-# will be generated that can be used as input for Apple's Xcode 3
-# integrated development environment, introduced with OSX 10.5 (Leopard).
-# To create a documentation set, doxygen will generate a Makefile in the
-# HTML output directory. Running make will produce the docset in that
-# directory and running "make install" will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
+# If the GENERATE_DOCSET tag is set to YES, additional index files
+# will be generated that can be used as input for Apple's Xcode 3
+# integrated development environment, introduced with OSX 10.5 (Leopard).
+# To create a documentation set, doxygen will generate a Makefile in the
+# HTML output directory. Running make will produce the docset in that
+# directory and running "make install" will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
# it at startup.
GENERATE_DOCSET = NO
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
-# feed. A documentation feed provides an umbrella under which multiple
-# documentation sets from a single provider (such as a company or product
suite)
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
+# feed. A documentation feed provides an umbrella under which multiple
+# documentation sets from a single provider (such as a company or product
suite)
# can be grouped.
DOCSET_FEEDNAME = "Doxygen generated docs"
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
-# should uniquely identify the documentation set bundle. This should be a
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
+# should uniquely identify the documentation set bundle. This should be a
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
# will append .docset to the name.
DOCSET_BUNDLE_ID = org.doxygen.Project
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded. For this to work a browser that supports
-# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded. For this to work a browser that supports
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
HTML_DYNAMIC_SECTIONS = NO
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-# be used to specify the file name of the resulting .chm file. You
-# can add a path in front of the file if the result should not be
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
+# be used to specify the file name of the resulting .chm file. You
+# can add a path in front of the file if the result should not be
# written to the html output directory.
-CHM_FILE =
+CHM_FILE =
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-# be used to specify the location (absolute path including file name) of
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
+# be used to specify the location (absolute path including file name) of
+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
# the HTML help compiler on the generated index.hhp.
-HHC_LOCATION =
+HHC_LOCATION =
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-# controls if a separate .chi index file is generated (YES) or that
+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
+# controls if a separate .chi index file is generated (YES) or that
# it should be included in the master .chm file (NO).
GENERATE_CHI = NO
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-# controls whether a binary table of contents is generated (YES) or a
+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
+# controls whether a binary table of contents is generated (YES) or a
# normal table of contents (NO) in the .chm file.
BINARY_TOC = NO
-# The TOC_EXPAND flag can be set to YES to add extra items for group members
+# The TOC_EXPAND flag can be set to YES to add extra items for group members
# to the contents of the HTML help documentation and to the tree view.
TOC_EXPAND = NO
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
-# top of each HTML page. The value NO (the default) enables the index and
+# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
+# top of each HTML page. The value NO (the default) enables the index and
# the value YES disables it.
DISABLE_INDEX = NO
-# This tag can be used to set the number of enum values (range [1..20])
+# This tag can be used to set the number of enum values (range [1..20])
# that doxygen will group on one line in the generated HTML documentation.
ENUM_VALUES_PER_LINE = 4
# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
-# generated containing a tree-like index structure (just like the one that
-# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
-# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
+# generated containing a tree-like index structure (just like the one that
+# is generated for HTML Help). For this to work a browser that supports
+# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+,
+# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are
# probably better off using the HTML help feature.
GENERATE_TREEVIEW = NO
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-# used to set the initial width (in pixels) of the frame in which the tree
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
+# used to set the initial width (in pixels) of the frame in which the tree
# is shown.
TREEVIEW_WIDTH = 250
@@ -848,74 +848,74 @@
# configuration options related to the LaTeX output
#---------------------------------------------------------------------------
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
# generate Latex output.
GENERATE_LATEX = NO
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
# put in front of it. If left blank `latex' will be used as the default path.
LATEX_OUTPUT = latex
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
# invoked. If left blank `latex' will be used as the default command name.
LATEX_CMD_NAME = latex
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-# generate index for LaTeX. If left blank `makeindex' will be used as the
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
+# generate index for LaTeX. If left blank `makeindex' will be used as the
# default command name.
MAKEINDEX_CMD_NAME = makeindex
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
+# LaTeX documents. This may be useful for small projects and may help to
# save some trees in general.
COMPACT_LATEX = NO
-# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, a4wide, letter, legal and
+# The PAPER_TYPE tag can be used to set the paper type that is used
+# by the printer. Possible values are: a4, a4wide, letter, legal and
# executive. If left blank a4wide will be used.
PAPER_TYPE = a4wide
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
# packages that should be included in the LaTeX output.
-EXTRA_PACKAGES =
+EXTRA_PACKAGES =
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-# the generated latex document. The header should contain everything until
-# the first chapter. If it is left blank doxygen will generate a
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
+# the generated latex document. The header should contain everything until
+# the first chapter. If it is left blank doxygen will generate a
# standard header. Notice: only use this tag if you know what you are doing!
-LATEX_HEADER =
+LATEX_HEADER =
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
+# contain links (just like the HTML output) instead of page references
# This makes the output suitable for online browsing using a pdf viewer.
PDF_HYPERLINKS = YES
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-# plain latex in the generated Makefile. Set this option to YES to get a
+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
+# plain latex in the generated Makefile. Set this option to YES to get a
# higher quality PDF documentation.
USE_PDFLATEX = YES
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-# command to the generated LaTeX files. This will instruct LaTeX to keep
-# running if errors occur, instead of asking the user for help.
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
+# command to the generated LaTeX files. This will instruct LaTeX to keep
+# running if errors occur, instead of asking the user for help.
# This option is also used when generating formulas in HTML.
LATEX_BATCHMODE = NO
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-# include the index chapters (such as File Index, Compound Index, etc.)
+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
+# include the index chapters (such as File Index, Compound Index, etc.)
# in the output.
LATEX_HIDE_INDICES = NO
@@ -924,68 +924,68 @@
# configuration options related to the RTF output
#---------------------------------------------------------------------------
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-# The RTF output is optimized for Word 97 and may not look very pretty with
+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
+# The RTF output is optimized for Word 97 and may not look very pretty with
# other RTF readers or editors.
GENERATE_RTF = NO
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
# put in front of it. If left blank `rtf' will be used as the default path.
RTF_OUTPUT = rtf
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-# RTF documents. This may be useful for small projects and may help to
+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
+# RTF documents. This may be useful for small projects and may help to
# save some trees in general.
COMPACT_RTF = NO
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-# will contain hyperlink fields. The RTF file will
-# contain links (just like the HTML output) instead of page references.
-# This makes the output suitable for online browsing using WORD or other
-# programs which support those fields.
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
+# will contain hyperlink fields. The RTF file will
+# contain links (just like the HTML output) instead of page references.
+# This makes the output suitable for online browsing using WORD or other
+# programs which support those fields.
# Note: wordpad (write) and others do not support links.
RTF_HYPERLINKS = NO
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
-# config file, i.e. a series of assignments. You only have to provide
+# Load stylesheet definitions from file. Syntax is similar to doxygen's
+# config file, i.e. a series of assignments. You only have to provide
# replacements, missing definitions are set to their default value.
-RTF_STYLESHEET_FILE =
+RTF_STYLESHEET_FILE =
-# Set optional variables used in the generation of an rtf document.
+# Set optional variables used in the generation of an rtf document.
# Syntax is similar to doxygen's config file.
-RTF_EXTENSIONS_FILE =
+RTF_EXTENSIONS_FILE =
#---------------------------------------------------------------------------
# configuration options related to the man page output
#---------------------------------------------------------------------------
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
# generate man pages
GENERATE_MAN = NO
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
# put in front of it. If left blank `man' will be used as the default path.
MAN_OUTPUT = man
-# The MAN_EXTENSION tag determines the extension that is added to
+# The MAN_EXTENSION tag determines the extension that is added to
# the generated man pages (default is the subroutine's section .3)
MAN_EXTENSION = .3
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-# then it will generate one additional man file for each entity
-# documented in the real man page(s). These additional files
-# only source the real man page, but without them the man command
+# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
+# then it will generate one additional man file for each entity
+# documented in the real man page(s). These additional files
+# only source the real man page, but without them the man command
# would be unable to find the correct page. The default is NO.
MAN_LINKS = NO
@@ -994,33 +994,33 @@
# configuration options related to the XML output
#---------------------------------------------------------------------------
-# If the GENERATE_XML tag is set to YES Doxygen will
-# generate an XML file that captures the structure of
+# If the GENERATE_XML tag is set to YES Doxygen will
+# generate an XML file that captures the structure of
# the code including all documentation.
GENERATE_XML = NO
-# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
# put in front of it. If left blank `xml' will be used as the default path.
XML_OUTPUT = xml
-# The XML_SCHEMA tag can be used to specify an XML schema,
-# which can be used by a validating XML parser to check the
+# The XML_SCHEMA tag can be used to specify an XML schema,
+# which can be used by a validating XML parser to check the
# syntax of the XML files.
-XML_SCHEMA =
+XML_SCHEMA =
-# The XML_DTD tag can be used to specify an XML DTD,
-# which can be used by a validating XML parser to check the
+# The XML_DTD tag can be used to specify an XML DTD,
+# which can be used by a validating XML parser to check the
# syntax of the XML files.
-XML_DTD =
+XML_DTD =
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
-# dump the program listings (including syntax highlighting
-# and cross-referencing information) to the XML output. Note that
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
+# dump the program listings (including syntax highlighting
+# and cross-referencing information) to the XML output. Note that
# enabling this will significantly increase the size of the XML output.
XML_PROGRAMLISTING = YES
@@ -1029,10 +1029,10 @@
# configuration options for the AutoGen Definitions output
#---------------------------------------------------------------------------
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-# generate an AutoGen Definitions (see autogen.sf.net) file
-# that captures the structure of the code including all
-# documentation. Note that this feature is still experimental
+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
+# generate an AutoGen Definitions (see autogen.sf.net) file
+# that captures the structure of the code including all
+# documentation. Note that this feature is still experimental
# and incomplete at the moment.
GENERATE_AUTOGEN_DEF = NO
@@ -1041,320 +1041,320 @@
# configuration options related to the Perl module output
#---------------------------------------------------------------------------
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-# generate a Perl module file that captures the structure of
-# the code including all documentation. Note that this
-# feature is still experimental and incomplete at the
+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
+# generate a Perl module file that captures the structure of
+# the code including all documentation. Note that this
+# feature is still experimental and incomplete at the
# moment.
GENERATE_PERLMOD = NO
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able
+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
# to generate PDF and DVI output from the Perl module output.
PERLMOD_LATEX = NO
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader. This is useful
-# if you want to understand what is going on. On the other hand, if this
-# tag is set to NO the size of the Perl module output will be much smaller
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
+# nicely formatted so it can be parsed by a human reader. This is useful
+# if you want to understand what is going on. On the other hand, if this
+# tag is set to NO the size of the Perl module output will be much smaller
# and Perl will parse it just the same.
PERLMOD_PRETTY = YES
-# The names of the make variables in the generated doxyrules.make file
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-# This is useful so different doxyrules.make files included by the same
+# The names of the make variables in the generated doxyrules.make file
+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
+# This is useful so different doxyrules.make files included by the same
# Makefile don't overwrite each other's variables.
-PERLMOD_MAKEVAR_PREFIX =
+PERLMOD_MAKEVAR_PREFIX =
#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
+# Configuration options related to the preprocessor
#---------------------------------------------------------------------------
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-# evaluate all C-preprocessor directives found in the sources and include
+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
+# evaluate all C-preprocessor directives found in the sources and include
# files.
ENABLE_PREPROCESSING = YES
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-# names in the source code. If set to NO (the default) only conditional
-# compilation will be performed. Macro expansion can be done in a controlled
+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
+# names in the source code. If set to NO (the default) only conditional
+# compilation will be performed. Macro expansion can be done in a controlled
# way by setting EXPAND_ONLY_PREDEF to YES.
MACRO_EXPANSION = NO
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# then the macro expansion is limited to the macros specified with the
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
+# then the macro expansion is limited to the macros specified with the
# PREDEFINED and EXPAND_AS_DEFINED tags.
EXPAND_ONLY_PREDEF = NO
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
# in the INCLUDE_PATH (see below) will be search if a #include is found.
SEARCH_INCLUDES = YES
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by
# the preprocessor.
-INCLUDE_PATH =
+INCLUDE_PATH =
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will
# be used.
-INCLUDE_FILE_PATTERNS =
+INCLUDE_FILE_PATTERNS =
-# The PREDEFINED tag can be used to specify one or more macro names that
-# are defined before the preprocessor is started (similar to the -D option of
-# gcc). The argument of the tag is a list of macros of the form: name
-# or name=definition (no spaces). If the definition and the = are
-# omitted =1 is assumed. To prevent a macro definition from being
-# undefined via #undef or recursively expanded use the := operator
+# The PREDEFINED tag can be used to specify one or more macro names that
+# are defined before the preprocessor is started (similar to the -D option of
+# gcc). The argument of the tag is a list of macros of the form: name
+# or name=definition (no spaces). If the definition and the = are
+# omitted =1 is assumed. To prevent a macro definition from being
+# undefined via #undef or recursively expanded use the := operator
# instead of the = operator.
-PREDEFINED =
+PREDEFINED =
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-# this tag can be used to specify a list of macro names that should be
expanded.
-# The macro definition that is found in the sources will be used.
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
+# this tag can be used to specify a list of macro names that should be
expanded.
+# The macro definition that is found in the sources will be used.
# Use the PREDEFINED tag if you want to use a different macro definition.
-EXPAND_AS_DEFINED =
+EXPAND_AS_DEFINED =
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all function-like macros that are alone
-# on a line, have an all uppercase name, and do not end with a semicolon. Such
-# function macros are typically used for boiler-plate code, and will confuse
+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
+# doxygen's preprocessor will remove all function-like macros that are alone
+# on a line, have an all uppercase name, and do not end with a semicolon. Such
+# function macros are typically used for boiler-plate code, and will confuse
# the parser if not removed.
SKIP_FUNCTION_MACROS = YES
#---------------------------------------------------------------------------
-# Configuration::additions related to external references
+# Configuration::additions related to external references
#---------------------------------------------------------------------------
-# The TAGFILES option can be used to specify one or more tagfiles.
-# Optionally an initial location of the external documentation
-# can be added for each tagfile. The format of a tag file without
-# this location is as follows:
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths or
-# URLs. If a location is present for each tag, the installdox tool
+# The TAGFILES option can be used to specify one or more tagfiles.
+# Optionally an initial location of the external documentation
+# can be added for each tagfile. The format of a tag file without
+# this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where "loc1" and "loc2" can be relative or absolute paths or
+# URLs. If a location is present for each tag, the installdox tool
# does not have to be run to correct the links.
# Note that each tag file must have a unique name
# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen
+# If a tag file is not located in the directory in which doxygen
# is run, you must also specify the path to the tagfile here.
-TAGFILES =
+TAGFILES =
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
# a tag file that is based on the input files it reads.
-GENERATE_TAGFILE =
+GENERATE_TAGFILE =
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-# in the class index. If set to NO only the inherited external classes
+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
+# in the class index. If set to NO only the inherited external classes
# will be listed.
ALLEXTERNALS = NO
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will
# be listed.
EXTERNAL_GROUPS = YES
-# The PERL_PATH should be the absolute path and name of the perl script
+# The PERL_PATH should be the absolute path and name of the perl script
# interpreter (i.e. the result of `which perl').
PERL_PATH = /usr/bin/perl
#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
+# Configuration options related to the dot tool
#---------------------------------------------------------------------------
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with
base
-# or super classes. Setting the tag to NO turns the diagrams off. Note that
-# this option is superseded by the HAVE_DOT option below. This is only a
-# fallback. It is recommended to install and use dot, since it yields more
+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
+# or super classes. Setting the tag to NO turns the diagrams off. Note that
+# this option is superseded by the HAVE_DOT option below. This is only a
+# fallback. It is recommended to install and use dot, since it yields more
# powerful graphs.
CLASS_DIAGRAMS = YES
-# You can define message sequence charts within doxygen comments using the
\msc
-# command. Doxygen will then run the mscgen tool (see
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in
the
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
# default search path.
-MSCGEN_PATH =
+MSCGEN_PATH =
-# If set to YES, the inheritance and collaboration graphs will hide
-# inheritance and usage relations if the target is undocumented
+# If set to YES, the inheritance and collaboration graphs will hide
+# inheritance and usage relations if the target is undocumented
# or is not a class.
HIDE_UNDOC_RELATIONS = YES
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz, a graph
visualization
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz, a graph visualization
+# toolkit from AT&T and Lucent Bell Labs. The other options in this section
# have no effect if this option is set to NO (the default)
HAVE_DOT = NO
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect inheritance relations. Setting this tag to YES will force the
+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect inheritance relations. Setting this tag to YES will force the
# the CLASS_DIAGRAMS tag to NO.
CLASS_GRAPH = YES
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect implementation dependencies (inheritance, containment, and
+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
+# will generate a graph for each documented class showing the direct and
+# indirect implementation dependencies (inheritance, containment, and
# class references variables) of the class with other documented classes.
COLLABORATION_GRAPH = YES
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
# will generate a graph for groups, showing the direct groups dependencies
GROUP_GRAPHS = YES
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
# Language.
UML_LOOK = NO
-# If set to YES, the inheritance and collaboration graphs will show the
+# If set to YES, the inheritance and collaboration graphs will show the
# relations between templates and their instances.
TEMPLATE_RELATIONS = NO
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-# tags are set to YES then doxygen will generate a graph for each documented
-# file showing the direct and indirect include dependencies of the file with
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
+# tags are set to YES then doxygen will generate a graph for each documented
+# file showing the direct and indirect include dependencies of the file with
# other documented files.
INCLUDE_GRAPH = YES
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-# documented header file showing the documented files that directly or
+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
+# documented header file showing the documented files that directly or
# indirectly include this file.
INCLUDED_BY_GRAPH = YES
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then
-# doxygen will generate a call dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable call graphs
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then
+# doxygen will generate a call dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable call graphs
# for selected functions only using the \callgraph command.
CALL_GRAPH = NO
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
-# doxygen will generate a caller dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable caller
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
+# doxygen will generate a caller dependency graph for every global function
+# or class method. Note that enabling this option will significantly increase
+# the time of a run. So in most cases it will be better to enable caller
# graphs for selected functions only using the \callergraph command.
CALLER_GRAPH = NO
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
# will graphical hierarchy of all classes instead of a textual one.
GRAPHICAL_HIERARCHY = YES
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
-# then doxygen will show the dependencies a directory has on other directories
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
+# then doxygen will show the dependencies a directory has on other directories
# in a graphical way. The dependency relations are determined by the #include
# relations between the files in the directories.
DIRECTORY_GRAPH = YES
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
# generated by dot. Possible values are png, jpg, or gif
# If left blank png will be used.
DOT_IMAGE_FORMAT = png
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# The tag DOT_PATH can be used to specify the path where the dot tool can be
# found. If left blank, it is assumed the dot tool can be found in the path.
-DOT_PATH =
+DOT_PATH =
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the
# \dotfile command).
-DOTFILE_DIRS =
+DOTFILE_DIRS =
-# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
-# nodes that will be shown in the graph. If the number of nodes in a graph
-# becomes larger than this value, doxygen will truncate the graph, which is
-# visualized by representing a node as a red box. Note that doxygen if the
-# number of direct children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
+# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
+# nodes that will be shown in the graph. If the number of nodes in a graph
+# becomes larger than this value, doxygen will truncate the graph, which is
+# visualized by representing a node as a red box. Note that doxygen if the
+# number of direct children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
DOT_GRAPH_MAX_NODES = 50
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes
-# that lay further from the root node will be omitted. Note that setting this
-# option to 1 or 2 may greatly reduce the computation time needed for large
-# code bases. Also note that the size of a graph can be further restricted by
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
+# graphs generated by dot. A depth value of 3 means that only nodes reachable
+# from the root by following a path via at most 3 edges will be shown. Nodes
+# that lay further from the root node will be omitted. Note that setting this
+# option to 1 or 2 may greatly reduce the computation time needed for large
+# code bases. Also note that the size of a graph can be further restricted by
# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
MAX_DOT_GRAPH_DEPTH = 0
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is enabled by default, which results in a transparent
-# background. Warning: Depending on the platform used, enabling this option
-# may lead to badly anti-aliased labels on the edges of a graph (i.e. they
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is enabled by default, which results in a transparent
+# background. Warning: Depending on the platform used, enabling this option
+# may lead to badly anti-aliased labels on the edges of a graph (i.e. they
# become hard to read).
DOT_TRANSPARENT = YES
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10)
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10)
# support this, this feature is disabled by default.
DOT_MULTI_TARGETS = NO
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-# generate a legend page explaining the meaning of the various boxes and
+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
+# generate a legend page explaining the meaning of the various boxes and
# arrows in the dot generated graphs.
GENERATE_LEGEND = YES
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-# remove the intermediate dot files that are used to generate
+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
+# remove the intermediate dot files that are used to generate
# the various graphs.
DOT_CLEANUP = YES
#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
+# Configuration::additions related to the search engine
#---------------------------------------------------------------------------
-# The SEARCHENGINE tag specifies whether or not a search engine should be
+# The SEARCHENGINE tag specifies whether or not a search engine should be
# used. If set to NO the values of all tags below this one will be ignored.
SEARCHENGINE = NO
Modified: trunk/docs/architecture.txt
==============================================================================
--- trunk/docs/architecture.txt Fri Nov 20 15:19:06 2009 (r1737)
+++ trunk/docs/architecture.txt Fri Nov 20 16:30:16 2009 (r1738)
@@ -94,7 +94,7 @@
+----------------+ +------------------------+
Assuming that each AR successfully exchanges the neighbor list, a mobile
guest also has a chance to determine its future access router, making use of
its several information about its wireless interface as well as a simple
procedure of pre-authentication.
-
+
First a MG measures its signal strength to all candidate access routers
located nearby itself. This can be simply performed by scanning on its wireless
interface, over all available frequencies.
Second, a MG periodically sends a pre-authentication packet to its current
access router, namely PAR(Previous Access Router), to obtain the list of the
actual neighbors. This communication is also done by a pair of simple UDP
request and response. Then a PAR returns to the MG its own list that contains
each entry of the IP address ans the token of NAR. Note that this list can
contain multiple entries of NAR, to get MG to determine its NAR among the
entries in the list by itself.
Modified: trunk/docs/packettype.txt
==============================================================================
--- trunk/docs/packettype.txt Fri Nov 20 15:19:06 2009 (r1737)
+++ trunk/docs/packettype.txt Fri Nov 20 16:30:16 2009 (r1738)
@@ -16,30 +16,30 @@
/**
* packet header part
*/
- pisa_tlv_type_t type; /* packet type. 2 bytes */
- pisa_tlv_len_t length; /* packet length. 2 bytes */
+ pisa_tlv_type_t type; /* packet type. 2 bytes */
+ pisa_tlv_len_t length; /* packet length. 2 bytes */
- pisa_packet_flags_t flags; /* flags. 2 bytes */
- uint8_t version; /* version. 1 byte */
- uint8_t reserved; /* 1 byte */
+ pisa_packet_flags_t flags; /* flags. 2 bytes */
+ uint8_t version; /* version. 1 byte */
+ uint8_t reserved; /* 1 byte */
/* Payload part from here, which can be either neighbor exchange,
* pre-authentication, binding update, or any type of raw data.
*/
union {
- pisa_payload_nereq_t nereq; /**< neighbor exchange req */
- pisa_payload_neres_t neres; /**< neighbor exchange res */
+ pisa_payload_nereq_t nereq; /**< neighbor exchange req */
+ pisa_payload_neres_t neres; /**< neighbor exchange res */
- pisa_payload_pareq_t pareq; /**< pre-authentication req */
- pisa_payload_pares_t pares; /**< pre-authentication res */
+ pisa_payload_pareq_t pareq; /**< pre-authentication req */
+ pisa_payload_pares_t pares; /**< pre-authentication res */
- pisa_payload_bureq_t bureq; /**< binding update req */
- pisa_payload_bures_t bures; /**< binding update res */
+ pisa_payload_bureq_t bureq; /**< binding update req */
+ pisa_payload_bures_t bures; /**< binding update res */
- pisa_payload_vrfyreq_t vrfyreq; /**< token verify req */
- pisa_payload_vrfyres_t vrfyres; /**< token verify res */
+ pisa_payload_vrfyreq_t vrfyreq; /**< token verify req */
+ pisa_payload_vrfyres_t vrfyres; /**< token verify res */
- char data[MAX_PACKET_BUFFER]; /** Raw data of payload */
+ char data[MAX_PACKET_BUFFER]; /** Raw data of payload */
}u;
...
}
Modified: trunk/docs/porting_osx.txt
==============================================================================
--- trunk/docs/porting_osx.txt Fri Nov 20 15:19:06 2009 (r1737)
+++ trunk/docs/porting_osx.txt Fri Nov 20 16:30:16 2009 (r1738)
@@ -1,13 +1,13 @@
This file documents the porting efforts to OS X
===============================================
-2009/11/07 Replaced linux-specific IP, UDP, and TCP headers with their
+2009/11/07 Replaced linux-specific IP, UDP, and TCP headers with their
RFC-compliant cousins. (r1559)
Notes:
* You need libconfig installed
- - sudo port install libconfig
+ - sudo port install libconfig
* You need to tell the configure where your darwin port libs are
- CPPFLAGS=-I/opt/local/include LDFLAGS=-L/opt/local/lib ./configure
Modified: trunk/openwrt/create_config.sh
==============================================================================
--- trunk/openwrt/create_config.sh Fri Nov 20 15:19:06 2009 (r1737)
+++ trunk/openwrt/create_config.sh Fri Nov 20 16:30:16 2009 (r1738)
@@ -19,8 +19,7 @@
}
recursive_replace () {
-
- echo $2 - $3
+ echo $2 - $3
find files $1 -type f -exec sed -i "s/$2/$3/g" "{}" \;
}
@@ -33,12 +32,11 @@
ROUTER_CHANNEL=$5
echo $#
-if [ "$#" != "5" ] ; then
+if [ "$#" != "5" ]; then
usage 0
fi
-
### sanity checks ###
case $1 in
-h|--help)
@@ -48,8 +46,6 @@
esac
-
-
### copy template to new router directory ###
check_directory template ${TEMPLATE_PATH}
Modified: trunk/openwrt/files/etc/config/dhcp
==============================================================================
--- trunk/openwrt/files/etc/config/dhcp Fri Nov 20 15:19:06 2009 (r1737)
+++ trunk/openwrt/files/etc/config/dhcp Fri Nov 20 16:30:16 2009 (r1738)
@@ -1,23 +1,23 @@
config dnsmasq
- option domainneeded 1
- option boguspriv 1
- option filterwin2k '0' #enable for dial on demand
- option localise_queries 1
- option local '/lan/'
- option domain 'lan'
- option expandhosts 1
- option nonegcache 0
- option authoritative 1
- option readethers 1
- option leasefile '/tmp/dhcp.leases'
- option resolvfile '/tmp/resolv.conf.auto'
+ option domainneeded 1
+ option boguspriv 1
+ option filterwin2k '0' #enable for dial on demand
+ option localise_queries 1
+ option local '/lan/'
+ option domain 'lan'
+ option expandhosts 1
+ option nonegcache 0
+ option authoritative 1
+ option readethers 1
+ option leasefile '/tmp/dhcp.leases'
+ option resolvfile '/tmp/resolv.conf.auto'
config dhcp lan
- option interface lan
- option start 100
- option limit 150
- option leasetime 12h
+ option interface lan
+ option start 100
+ option limit 150
+ option leasetime 12h
config dhcp wan
- option interface wan
- option ignore 1
+ option interface wan
+ option ignore 1
Modified: trunk/openwrt/files/etc/config/dropbear
==============================================================================
--- trunk/openwrt/files/etc/config/dropbear Fri Nov 20 15:19:06 2009
(r1737)
+++ trunk/openwrt/files/etc/config/dropbear Fri Nov 20 16:30:16 2009
(r1738)
@@ -1,3 +1,3 @@
config dropbear
- option PasswordAuth 'on'
- option Port '22'
+ option PasswordAuth 'on'
+ option Port '22'
Modified: trunk/openwrt/files/etc/config/firewall
==============================================================================
--- trunk/openwrt/files/etc/config/firewall Fri Nov 20 15:19:06 2009
(r1737)
+++ trunk/openwrt/files/etc/config/firewall Fri Nov 20 16:30:16 2009
(r1738)
@@ -1,81 +1,81 @@
config defaults
- option syn_flood 1
- option input ACCEPT
- option output ACCEPT
- option forward REJECT
+ option syn_flood 1
+ option input ACCEPT
+ option output ACCEPT
+ option forward REJECT
config zone
- option name lan
- option input ACCEPT
- option output ACCEPT
- option forward REJECT
+ option name lan
+ option input ACCEPT
+ option output ACCEPT
+ option forward REJECT
config zone
- option name wan
-# option input REJECT # commented out for pisa
- option input ACCEPT
- option output ACCEPT
- option forward REJECT
- option masq 1
-
-config forwarding
- option src lan
- option dest wan
+ option name wan
+# option input REJECT # commented out for pisa
+ option input ACCEPT
+ option output ACCEPT
+ option forward REJECT
+ option masq 1
+
+config forwarding
+ option src lan
+ option dest wan
### EXAMPLE CONFIG SECTIONS
# do not allow a specific ip to access wan
#config rule
-# option src lan
-# option src_ip 192.168.45.2
-# option dest wan
-# option proto tcp
-# option target REJECT
+# option src lan
+# option src_ip 192.168.45.2
+# option dest wan
+# option proto tcp
+# option target REJECT
# block a specific mac on wan
#config rule
-# option dest wan
-# option src_mac 00:11:22:33:44:66
-# option target REJECT
+# option dest wan
+# option src_mac 00:11:22:33:44:66
+# option target REJECT
# block incoming ICMP traffic on a zone
#config rule
-# option src lan
-# option proto ICMP
-# option target DROP
+# option src lan
+# option proto ICMP
+# option target DROP
# port redirect port coming in on wan to lan
#config redirect
-# option src wan
-# option src_dport 80
-# option dest lan
-# option dest_ip 192.168.16.235
-# option dest_port 80
-# option proto tcp
+# option src wan
+# option src_dport 80
+# option dest lan
+# option dest_ip 192.168.16.235
+# option dest_port 80
+# option proto tcp
# include a file with users custom iptables rules
#config include
-# option path /etc/firewall.user
+# option path /etc/firewall.user
### FULL CONFIG SECTIONS
#config rule
-# option src lan
-# option src_ip 192.168.45.2
-# option src_mac 00:11:22:33:44:55
-# option src_port 80
-# option dest wan
-# option dest_ip 194.25.2.129
-# option dest_port 120
-# option proto tcp
-# option target REJECT
+# option src lan
+# option src_ip 192.168.45.2
+# option src_mac 00:11:22:33:44:55
+# option src_port 80
+# option dest wan
+# option dest_ip 194.25.2.129
+# option dest_port 120
+# option proto tcp
+# option target REJECT
#config redirect
-# option src lan
-# option src_ip 192.168.45.2
-# option src_mac 00:11:22:33:44:55
-# option src_port 1024
-# option src_dport 80
-# option dest_ip 194.25.2.129
-# option dest_port 120
-# option proto tcp
+# option src lan
+# option src_ip 192.168.45.2
+# option src_mac 00:11:22:33:44:55
+# option src_port 1024
+# option src_dport 80
+# option dest_ip 194.25.2.129
+# option dest_port 120
+# option proto tcp
Modified: trunk/openwrt/files/etc/config/httpd
==============================================================================
--- trunk/openwrt/files/etc/config/httpd Fri Nov 20 15:19:06 2009
(r1737)
+++ trunk/openwrt/files/etc/config/httpd Fri Nov 20 16:30:16 2009
(r1738)
@@ -1,5 +1,4 @@
-
config 'httpd'
- option 'port' '80'
- option 'home' '/www'
+ option 'port' '80'
+ option 'home' '/www'
Modified: trunk/openwrt/files/etc/config/ntpclient
==============================================================================
--- trunk/openwrt/files/etc/config/ntpclient Fri Nov 20 15:19:06 2009
(r1737)
+++ trunk/openwrt/files/etc/config/ntpclient Fri Nov 20 16:30:16 2009
(r1738)
@@ -1,10 +1,10 @@
config ntpserver
- option hostname 'pisa-morpheus'
- option port '123'
+ option hostname 'pisa-morpheus'
+ option port '123'
config ntpdrift
- option freq '0'
+ option freq '0'
config ntpclient
- option interval 60
- #option count 10
+ option interval 60
+ #option count 10
Modified: trunk/openwrt/files/etc/hip/hipd_config
==============================================================================
--- trunk/openwrt/files/etc/hip/hipd_config Fri Nov 20 15:19:06 2009
(r1737)
+++ trunk/openwrt/files/etc/hip/hipd_config Fri Nov 20 16:30:16 2009
(r1738)
@@ -1,3 +1,3 @@
opendht off
-#nat plain-udp # use UDP encapsulation, not working yet.
-debug all # debug verbosity: all, medium or none.
+#nat plain-udp # use UDP encapsulation, not working yet.
+debug all # debug verbosity: all, medium or none.
Modified: trunk/openwrt/files/etc/hip/hosts
==============================================================================
--- trunk/openwrt/files/etc/hip/hosts Fri Nov 20 15:19:06 2009 (r1737)
+++ trunk/openwrt/files/etc/hip/hosts Fri Nov 20 16:30:16 2009 (r1738)
@@ -1,5 +1,5 @@
# The name in the second row must match the name in /etc/hosts to let hipd
# know which IP to use.
-2001:10:17e5:e586:5f1b:a01b:f5c9:f825 pisa-morpheus
-2001:14:dc2e:4586:27d0:fbde:2e46:d24 pisa-gate1
-2001:12:69af:ac37:6cbb:519d:b319:9b80 pisa-gate2
+2001:10:17e5:e586:5f1b:a01b:f5c9:f825 pisa-morpheus
+2001:14:dc2e:4586:27d0:fbde:2e46:d24 pisa-gate1
+2001:12:69af:ac37:6cbb:519d:b319:9b80 pisa-gate2
Modified: trunk/openwrt/files/etc/pisa/pisacd.conf
==============================================================================
--- trunk/openwrt/files/etc/pisa/pisacd.conf Fri Nov 20 15:19:06 2009
(r1737)
+++ trunk/openwrt/files/etc/pisa/pisacd.conf Fri Nov 20 16:30:16 2009
(r1738)
@@ -18,34 +18,34 @@
# A list of all servers we want to connect to.
servers = (
- { # gate1, virtual machine on morpheus
- hit = "2001:14:dc2e:4586:27d0:fbde:2e46:d24";
- type = "legacyrouter";
- services = (
- {
- local = "192.168.44.2";
- remote = "192.168.9.2";
- }
- );
- },
- { # gate2, virtual machine on morpheus
- hit = "2001:12:69af:ac37:6cbb:519d:b319:9b80";
- type = "legacyrouter";
- services = (
- {
- local = "192.168.44.3";
- remote = "192.168.9.3";
- }
- );
- },
- { # morpheus itself
- hit = "2001:10:17e5:e586:5f1b:a01b:f5c9:f825";
- type = "legacyrouter";
- services = (
- {
- local = "192.168.44.4";
- remote = "192.168.5.1";
- }
- );
- }
+ { # gate1, virtual machine on morpheus
+ hit = "2001:14:dc2e:4586:27d0:fbde:2e46:d24";
+ type = "legacyrouter";
+ services = (
+ {
+ local = "192.168.44.2";
+ remote = "192.168.9.2";
+ }
+ );
+ },
+ { # gate2, virtual machine on morpheus
+ hit = "2001:12:69af:ac37:6cbb:519d:b319:9b80";
+ type = "legacyrouter";
+ services = (
+ {
+ local = "192.168.44.3";
+ remote = "192.168.9.3";
+ }
+ );
+ },
+ { # morpheus itself
+ hit = "2001:10:17e5:e586:5f1b:a01b:f5c9:f825";
+ type = "legacyrouter";
+ services = (
+ {
+ local = "192.168.44.4";
+ remote = "192.168.5.1";
+ }
+ );
+ }
);
Modified: trunk/openwrt/package/hipl/Makefile
==============================================================================
--- trunk/openwrt/package/hipl/Makefile Fri Nov 20 15:19:06 2009 (r1737)
+++ trunk/openwrt/package/hipl/Makefile Fri Nov 20 16:30:16 2009 (r1738)
@@ -15,13 +15,13 @@
include $(INCLUDE_DIR)/package.mk
define Package/hipl-hipd
- SECTION:=net
- CATEGORY:=Network
- DEPENDS:=+hipl-common +genl +ip +kmod-ipsec +kmod-ipsec4 +kmod-ipsec6
+kmod-loop +kmod-nbd +kmod-tun +libpthread +libuuid +losetup +kmod-dummy
+kmod-ipip +kmod-crypto-authenc
- # TODO: probably not needed:
- #+kmod-capi +libpcap +udevtrigger +ipsec-tools +isakmpd
- TITLE:=HIPL deamon
- URL:=http://hipl.hiit.fi/
+ SECTION:=net
+ CATEGORY:=Network
+ DEPENDS:=+hipl-common +genl +ip +kmod-ipsec +kmod-ipsec4 +kmod-ipsec6
+kmod-loop +kmod-nbd +kmod-tun +libpthread +libuuid +losetup +kmod-dummy
+kmod-ipip +kmod-crypto-authenc
+ # TODO: probably not needed:
+ #+kmod-capi +libpcap +udevtrigger +ipsec-tools +isakmpd
+ TITLE:=HIPL deamon
+ URL:=http://hipl.hiit.fi/
endef
define Package/hipl-hipd/description
@@ -29,13 +29,13 @@
endef
define Package/hipl-hipfw
- SECTION:=net
- CATEGORY:=Network
- DEPENDS:=+hipl-common +iptables +ip6tables +kmod-ip6tables +kmod-ipt-queue
- # TUN/TAP support - might be needed at some point instead of
kmod-ipt-queue
- #+kmod-tun
- TITLE:=HIPL firewall
- URL:=http://hipl.hiit.fi/
+ SECTION:=net
+ CATEGORY:=Network
+ DEPENDS:=+hipl-common +iptables +ip6tables +kmod-ip6tables +kmod-ipt-queue
+ # TUN/TAP support - might be needed at some point instead of
kmod-ipt-queue
+ #+kmod-tun
+ TITLE:=HIPL firewall
+ URL:=http://hipl.hiit.fi/
endef
define Package/hipl-hipfw/description
@@ -43,11 +43,11 @@
endef
define Package/hipl-hipconf
- SECTION:=net
- CATEGORY:=Network
- DEPENDS:=+hipl-hipd
- TITLE:=HIPL configuration application
- URL:=http://hipl.hiit.fi/
+ SECTION:=net
+ CATEGORY:=Network
+ DEPENDS:=+hipl-hipd
+ TITLE:=HIPL configuration application
+ URL:=http://hipl.hiit.fi/
endef
define Package/hipl-hipconf/description
@@ -55,11 +55,11 @@
endef
define Package/hipl-hipproxy
- SECTION:=net
- CATEGORY:=Network
- DEPENDS:=+hipl-hipd +hipl-hipfw
- TITLE:=HIPL proxy
- URL:=http://hipl.hiit.fi/
+ SECTION:=net
+ CATEGORY:=Network
+ DEPENDS:=+hipl-hipd +hipl-hipfw
+ TITLE:=HIPL proxy
+ URL:=http://hipl.hiit.fi/
endef
define Package/hipl-hipproxy/description
@@ -67,11 +67,11 @@
endef
define Package/hipl-test
- SECTION:=net
- CATEGORY:=Network
- DEPENDS:=+hipl-hipd
- TITLE:=HIPL testing application
- URL:=http://hipl.hiit.fi/
+ SECTION:=net
+ CATEGORY:=Network
+ DEPENDS:=+hipl-hipd
+ TITLE:=HIPL testing application
+ URL:=http://hipl.hiit.fi/
endef
define Package/hipl-test/description
@@ -79,15 +79,15 @@
endef
define Package/hipl-common
- SECTION:=net
- CATEGORY:=Network
-#this list includes ALL modules necessary for running hipl on openwrt
-#note: modules will be automatically selected for compilation and
-#will be required by ipkg on the openwrt box
-#TODO remove unnecessary modules
- DEPENDS:=+kmod-crypto-aes +kmod-crypto-hmac +kmod-crypto-null
+kmod-crypto-sha1 +kmod-ipv6 +libgcc +libopenssl +libxml2
- TITLE:=HIPL common files
- URL:=http://hipl.hiit.fi/
+ SECTION:=net
+ CATEGORY:=Network
+ #this list includes ALL modules necessary for running hipl on openwrt
+ #note: modules will be automatically selected for compilation and
+ #will be required by ipkg on the openwrt box
+ #TODO remove unnecessary modules
+ DEPENDS:=+kmod-crypto-aes +kmod-crypto-hmac +kmod-crypto-null
+kmod-crypto-sha1 +kmod-ipv6 +libgcc +libopenssl +libxml2
+ TITLE:=HIPL common files
+ URL:=http://hipl.hiit.fi/
endef
define Package/hipl-common/description
@@ -96,106 +96,102 @@
# seen when compiling hipl: -lxml2 -lcap -lsqlite3 -lipq -luuid -lm -lcrypto
CONFIGURE_VARS += \
- LIBS="-lxml2 -lcrypto -lm -lz" \
- CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/libxml2
-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
-I$(TOOLCHAIN_DIR)/include" \
- LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
-L$(TOOLCHAIN_DIR)/lib" \
- OPENWRT="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
-L$(TOOLCHAIN_DIR)/lib" \
+ LIBS="-lxml2 -lcrypto -lm -lz" \
+ CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/libxml2
-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
-I$(TOOLCHAIN_DIR)/include" \
+ LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
-L$(TOOLCHAIN_DIR)/lib" \
+ OPENWRT="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
-L$(TOOLCHAIN_DIR)/lib" \
define Build/Configure
- (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
- ./autogen.sh --host=$(GNU_TARGET_NAME)
--target=$(GNU_TARGET_NAME) \
- );
-
- (cd $(PKG_BUILD_DIR)/libinet6; test -L include || ln -v -s
include_glibc23 include; \
- );
-
- (cp $(PKG_BUILD_DIR)/libinet6/include/ifaddrs.h $(STAGING_DIR)/include/
\
- );
-
- (cd ..; \
- );
-
- $(CONFIGURE_VARS);
-
- $(call Build/Configure/Default, \
- --enable-shared \
- --enable-force-shlib \
- --enable-midauth \
- --enable-openwrt \
- --enable-optimizations \
- --disable-opendht \
- --disable-nls \
- --disable-agent \
- --disable-privsep \
- --disable-i3 \
- --disable-debug \
- );
+ (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
+ ./autogen.sh --host=$(GNU_TARGET_NAME) --target=$(GNU_TARGET_NAME));
+
+ (cd $(PKG_BUILD_DIR)/libinet6; test -L include || ln -v -s
include_glibc23 include;);
+
+ (cp $(PKG_BUILD_DIR)/libinet6/include/ifaddrs.h $(STAGING_DIR)/include/);
+
+ (cd ..;);
+
+ $(CONFIGURE_VARS);
+
+ $(call Build/Configure/Default, \
+ --enable-shared \
+ --enable-force-shlib \
+ --enable-midauth \
+ --enable-openwrt \
+ --enable-optimizations \
+ --disable-opendht \
+ --disable-nls \
+ --disable-agent \
+ --disable-privsep \
+ --disable-i3 \
+ --disable-debug \
+ );
endef
define Build/Compile
- ($(CONFIGURE_VARS) \
- $(MAKE) -C $(PKG_BUILD_DIR));
- $(MAKE) -C $(PKG_BUILD_DIR) \
- DESTDIR="$(PKG_INSTALL_DIR)" \
- INSTALL="install -c" \
- install
+ ($(CONFIGURE_VARS) \
+ $(MAKE) -C $(PKG_BUILD_DIR));
+ $(MAKE) -C $(PKG_BUILD_DIR) \
+ DESTDIR="$(PKG_INSTALL_DIR)" \
+ INSTALL="install -c" \
+ install
endef
define Package/hipl-hipd/install
- $(INSTALL_DIR) $(1)/etc/init.d/
- $(INSTALL_DIR) $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/etc/init.d/
+ $(INSTALL_DIR) $(1)/usr/sbin/
- $(INSTALL_BIN) ./files/hipd.init $(1)/etc/init.d/hipd
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/hipd $(1)/usr/sbin/
+ $(INSTALL_BIN) ./files/hipd.init $(1)/etc/init.d/hipd
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/hipd $(1)/usr/sbin/
endef
define Package/hipl-hipfw/install
- $(INSTALL_DIR) $(1)/etc/init.d/
- $(INSTALL_DIR) $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/etc/init.d/
+ $(INSTALL_DIR) $(1)/usr/sbin/
- $(INSTALL_BIN) ./files/hipfw.init $(1)/etc/init.d/hipfw
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/hipfw $(1)/usr/sbin/
+ $(INSTALL_BIN) ./files/hipfw.init $(1)/etc/init.d/hipfw
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/hipfw $(1)/usr/sbin/
endef
define Package/hipl-hipconf/install
- $(INSTALL_DIR) $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/usr/sbin/
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/hipconf $(1)/usr/sbin/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/hipconf $(1)/usr/sbin/
endef
define Package/hipl-hipproxy/install
- $(INSTALL_DIR) $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/usr/sbin/
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/hipdnsproxy $(1)/usr/sbin/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/hipdnsproxy $(1)/usr/sbin/
endef
define Package/hipl-test/install
- $(INSTALL_DIR) $(1)/etc/hip/test/
- $(INSTALL_DIR) $(1)/usr/bin/
+ $(INSTALL_DIR) $(1)/etc/hip/test/
+ $(INSTALL_DIR) $(1)/usr/bin/
- $(INSTALL_BIN) ./files/test/* $(1)/etc/hip/test/
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/conntest* $(1)/usr/bin/
+ $(INSTALL_BIN) ./files/test/* $(1)/etc/hip/test/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/conntest* $(1)/usr/bin/
endef
define Package/hipl-common/install
- $(INSTALL_DIR) $(1)/etc/hip/
- $(INSTALL_DIR) $(1)/etc/modules.d/
- $(INSTALL_DIR) $(1)/usr/lib/
- $(INSTALL_DIR) $(1)/usr/bin/
- $(INSTALL_DIR) $(1)/usr/include/
- $(INSTALL_DIR) $(1)/usr/include/libipsec
-
- $(INSTALL_DATA) ./files/hipl.modules $(1)/etc/modules.d/35-hipl
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libhipopendht.so*
$(1)/usr/lib/
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libhipopendht.la
$(1)/usr/lib/
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libhiptool.so* $(1)/usr/lib/
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libhiptool.la $(1)/usr/lib/
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libinet6.so* $(1)/usr/lib/
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libinet6.la $(1)/usr/lib/
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libopphip.so* $(1)/usr/lib/
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libopphip.la $(1)/usr/lib/
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/hipsetup $(1)/usr/bin/
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/listifaces $(1)/usr/bin/
+ $(INSTALL_DIR) $(1)/etc/hip/
+ $(INSTALL_DIR) $(1)/etc/modules.d/
+ $(INSTALL_DIR) $(1)/usr/lib/
+ $(INSTALL_DIR) $(1)/usr/bin/
+ $(INSTALL_DIR) $(1)/usr/include/
+ $(INSTALL_DIR) $(1)/usr/include/libipsec
+
+ $(INSTALL_DATA) ./files/hipl.modules $(1)/etc/modules.d/35-hipl
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libhipopendht.so* $(1)/usr/lib/
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libhipopendht.la $(1)/usr/lib/
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libhiptool.so* $(1)/usr/lib/
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libhiptool.la $(1)/usr/lib/
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libinet6.so* $(1)/usr/lib/
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libinet6.la $(1)/usr/lib/
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libopphip.so* $(1)/usr/lib/
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libopphip.la $(1)/usr/lib/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/hipsetup $(1)/usr/bin/
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/listifaces $(1)/usr/bin/
endef
$(eval $(call BuildPackage,hipl-common))
Modified: trunk/openwrt/package/hipl/files/hipd.init
==============================================================================
--- trunk/openwrt/package/hipl/files/hipd.init Fri Nov 20 15:19:06 2009
(r1737)
+++ trunk/openwrt/package/hipl/files/hipd.init Fri Nov 20 16:30:16 2009
(r1738)
@@ -7,20 +7,20 @@
HIPD_OPTS="-bk"
start() {
- echo -n "Starting hipd"
- hipd ${HIPD_OPTS}
- echo "."
+ echo -n "Starting hipd"
+ hipd ${HIPD_OPTS}
+ echo "."
}
restart() {
- echo -n "Restarting hipd"
- killall hipd
- hipd ${HIPD_OPTS}
- echo "."
+ echo -n "Restarting hipd"
+ killall hipd
+ hipd ${HIPD_OPTS}
+ echo "."
}
stop() {
- echo -n "Stopping hipd"
- killall hipd
- echo "."
+ echo -n "Stopping hipd"
+ killall hipd
+ echo "."
}
Modified: trunk/openwrt/package/hipl/files/hipfw.init
==============================================================================
--- trunk/openwrt/package/hipl/files/hipfw.init Fri Nov 20 15:19:06 2009
(r1737)
+++ trunk/openwrt/package/hipl/files/hipfw.init Fri Nov 20 16:30:16 2009
(r1738)
@@ -9,14 +9,14 @@
HIPFW_START='hipfw -mb'
start() {
- echo -n "Starting hipfw"
-# ${HIPFW_INIT}
- ${HIPFW_START}
- echo "."
+ echo -n "Starting hipfw"
+# ${HIPFW_INIT}
+ ${HIPFW_START}
+ echo "."
}
stop() {
- echo -n "Stopping hipfw"
- killall hipfw
- echo "."
+ echo -n "Stopping hipfw"
+ killall hipfw
+ echo "."
}
Modified: trunk/openwrt/package/hipl/files/hipl.modules
==============================================================================
--- trunk/openwrt/package/hipl/files/hipl.modules Fri Nov 20 15:19:06
2009 (r1737)
+++ trunk/openwrt/package/hipl/files/hipl.modules Fri Nov 20 16:30:16
2009 (r1738)
@@ -18,9 +18,9 @@
ipcomp6
xfrm4_mode_beet
xfrm4_mode_transport
-xfrm4_mode_tunnel
-xfrm6_mode_beet
+xfrm4_mode_tunnel
+xfrm6_mode_beet
xfrm6_mode_transport
-xfrm6_mode_tunnel
+xfrm6_mode_tunnel
rng
krng
Modified: trunk/openwrt/package/hipl/files/test/firewall.init
==============================================================================
--- trunk/openwrt/package/hipl/files/test/firewall.init Fri Nov 20 15:19:06
2009 (r1737)
+++ trunk/openwrt/package/hipl/files/test/firewall.init Fri Nov 20 16:30:16
2009 (r1738)
@@ -2,19 +2,19 @@
NET_INTNAT=192.168.6.0/24
-iptables -P INPUT ACCEPT
-iptables -P OUTPUT ACCEPT
+iptables -P INPUT ACCEPT
+iptables -P OUTPUT ACCEPT
iptables -P FORWARD ACCEPT
ip6tables -A FORWARD -p 253 -j QUEUE
-ip6tables -A FORWARD -p 50 -j QUEUE
-ip6tables -A FORWARD -p 22 -j ACCEPT
-ip6tables -A INPUT -p 253 -j QUEUE
-ip6tables -A INPUT -p 50 -j QUEUE
-ip6tables -A INPUT -p 22 -j ACCEPT
-ip6tables -A OUTPUT -p 253 -j QUEUE
-ip6tables -A OUTPUT -p 50 -j QUEUE
-ip6tables -A OUTPUT -p 22 -j ACCEPT
+ip6tables -A FORWARD -p 50 -j QUEUE
+ip6tables -A FORWARD -p 22 -j ACCEPT
+ip6tables -A INPUT -p 253 -j QUEUE
+ip6tables -A INPUT -p 50 -j QUEUE
+ip6tables -A INPUT -p 22 -j ACCEPT
+ip6tables -A OUTPUT -p 253 -j QUEUE
+ip6tables -A OUTPUT -p 50 -j QUEUE
+ip6tables -A OUTPUT -p 22 -j ACCEPT
iptables -t nat -F
Modified: trunk/openwrt/package/hipl/files/test/firewall.start
==============================================================================
--- trunk/openwrt/package/hipl/files/test/firewall.start Fri Nov 20
15:19:06 2009 (r1737)
+++ trunk/openwrt/package/hipl/files/test/firewall.start Fri Nov 20
16:30:16 2009 (r1738)
@@ -28,16 +28,14 @@
rm $RULE_FILE 2>/dev/null
-for INIT in $ACCEPT_INIT_LIST
-do
- echo "FORWARD -src_hit $INIT -dst_hit $RESP ACCEPT" >> $RULE_FILE
- echo "FORWARD -src_hit $RESP -dst_hit $INIT ACCEPT" >> $RULE_FILE
+for INIT in $ACCEPT_INIT_LIST; do
+ echo "FORWARD -src_hit $INIT -dst_hit $RESP ACCEPT" >> $RULE_FILE
+ echo "FORWARD -src_hit $RESP -dst_hit $INIT ACCEPT" >> $RULE_FILE
done
-for INIT in $DROP_INIT_LIST
-do
- echo "FORWARD -src_hit $INIT -dst_hit $RESP DROP" >> $RULE_FILE
- echo "FORWARD -src_hit $RESP -dst_hit $INIT DROP" >> $RULE_FILE
+for INIT in $DROP_INIT_LIST; do
+ echo "FORWARD -src_hit $INIT -dst_hit $RESP DROP" >> $RULE_FILE
+ echo "FORWARD -src_hit $RESP -dst_hit $INIT DROP" >> $RULE_FILE
done
hipfw ${HIPFW_OPTS} $RULE_FILE $TIMEOUT
Modified: trunk/openwrt/package/libxml2/Makefile
==============================================================================
--- trunk/openwrt/package/libxml2/Makefile Fri Nov 20 15:19:06 2009
(r1737)
+++ trunk/openwrt/package/libxml2/Makefile Fri Nov 20 16:30:16 2009
(r1738)
@@ -14,7 +14,7 @@
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://xmlsoft.org/sources/ \
- ftp://fr.rpmfind.net/pub/libxml/
+ ftp://fr.rpmfind.net/pub/libxml/
PKG_CAT:=zcat
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -31,69 +31,68 @@
endef
define Build/Configure
- $(call Build/Configure/Default, \
- --enable-shared \
- --enable-static \
- --with-c14n \
- --with-html \
- --without-ftp \
- --without-http \
- --without-iconv \
- --without-iso8859x \
- --with-legacy \
- --with-output \
- --with-reader \
- --with-sax1 \
- --with-schemas \
- --with-threads \
- --with-tree \
- --with-valid \
- --with-writer \
- --with-xinclude \
- --with-xpath \
- --with-xptr \
- --with-zlib \
- --with-regexp \
- )
+ $(call Build/Configure/Default, \
+ --enable-shared \
+ --enable-static \
+ --with-c14n \
+ --with-html \
+ --without-ftp \
+ --without-http \
+ --without-iconv \
+ --without-iso8859x \
+ --with-legacy \
+ --with-output \
+ --with-reader \
+ --with-sax1 \
+ --with-schemas \
+ --with-threads \
+ --with-tree \
+ --with-valid \
+ --with-writer \
+ --with-xinclude \
+ --with-xpath \
+ --with-xptr \
+ --with-zlib \
+ --with-regexp \
+ )
endef
define Build/Compile
- $(MAKE) -C $(PKG_BUILD_DIR) \
- DESTDIR="$(PKG_INSTALL_DIR)" \
- all install
+ $(MAKE) -C $(PKG_BUILD_DIR) \
+ DESTDIR="$(PKG_INSTALL_DIR)" \
+ all install
endef
define Build/InstallDev
- mkdir -p $(STAGING_DIR)/usr/bin
- $(CP) $(PKG_INSTALL_DIR)/usr/bin/xml2-config $(STAGING_DIR)/usr/bin/
- mkdir -p $(STAGING_DIR)/usr/include
- $(CP) $(PKG_INSTALL_DIR)/usr/include/libxml2 $(STAGING_DIR)/usr/include/
- mkdir -p $(STAGING_DIR)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxml2.{a,so*} $(STAGING_DIR)/usr/lib/
- mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
$(STAGING_DIR)/usr/lib/pkgconfig/
- $(SED) 's,-I$$$${includedir}/libxml2,,g'
$(STAGING_DIR)/usr/bin/xml2-config
- $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/bin/xml2-config
- $(SED) 's,-I$(STAGING_DIR)/usr/include,,g'
$(STAGING_DIR)/usr/bin/xml2-config
- $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/bin/xml2-config
- $(SED) 's,-L$(STAGING_DIR)/usr/lib,,g'
$(STAGING_DIR)/usr/bin/xml2-config
- $(SED) 's,-I$$$${includedir}/libxml2,,g'
$(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
- $(SED) 's,-L$$$${libdir},,g'
$(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
- $(SED) "s,"prefix\=/usr",prefix=$(STAGING_DIR)/usr,"
$(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
- $(SED) "s,"exec_prefix\=/usr",exec_prefix=$(STAGING_DIR)/usr,"
$(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
+ mkdir -p $(STAGING_DIR)/usr/bin
+ $(CP) $(PKG_INSTALL_DIR)/usr/bin/xml2-config $(STAGING_DIR)/usr/bin/
+ mkdir -p $(STAGING_DIR)/usr/include
+ $(CP) $(PKG_INSTALL_DIR)/usr/include/libxml2 $(STAGING_DIR)/usr/include/
+ mkdir -p $(STAGING_DIR)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxml2.{a,so*} $(STAGING_DIR)/usr/lib/
+ mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
$(STAGING_DIR)/usr/lib/pkgconfig/
+ $(SED) 's,-I$$$${includedir}/libxml2,,g' $(STAGING_DIR)/usr/bin/xml2-config
+ $(SED) 's,-I$$$${includedir},,g' $(STAGING_DIR)/usr/bin/xml2-config
+ $(SED) 's,-I$(STAGING_DIR)/usr/include,,g'
$(STAGING_DIR)/usr/bin/xml2-config
+ $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/bin/xml2-config
+ $(SED) 's,-L$(STAGING_DIR)/usr/lib,,g' $(STAGING_DIR)/usr/bin/xml2-config
+ $(SED) 's,-I$$$${includedir}/libxml2,,g'
$(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
+ $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
+ $(SED) "s,"prefix\=/usr",prefix=$(STAGING_DIR)/usr,"
$(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
+ $(SED) "s,"exec_prefix\=/usr",exec_prefix=$(STAGING_DIR)/usr,"
$(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
endef
define Build/UninstallDev
- rm -rf \
- $(STAGING_DIR)/usr/bin/xml2-config \
- $(STAGING_DIR)/usr/include/libxml2 \
- $(STAGING_DIR)/usr/lib/libxml2.{a,so*} \
- $(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
+ rm -rf $(STAGING_DIR)/usr/bin/xml2-config \
+ $(STAGING_DIR)/usr/include/libxml2 \
+ $(STAGING_DIR)/usr/lib/libxml2.{a,so*} \
+ $(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc
endef
define Package/libxml2/install
- $(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxml2.so.* $(1)/usr/lib/
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxml2.so.* $(1)/usr/lib/
endef
$(eval $(call BuildPackage,libxml2))
Modified: trunk/openwrt/package/pisa/Makefile
==============================================================================
--- trunk/openwrt/package/pisa/Makefile Fri Nov 20 15:19:06 2009 (r1737)
+++ trunk/openwrt/package/pisa/Makefile Fri Nov 20 16:30:16 2009 (r1738)
@@ -13,10 +13,10 @@
include $(INCLUDE_DIR)/package.mk
define Package/pisa/Default
- SECTION:=net
- CATEGORY:=Network
- TITLE:=Peer-to-peer Internet Wi-Fi Sharing System
- URL:=http://localhost/
+ SECTION:=net
+ CATEGORY:=Network
+ TITLE:=Peer-to-peer Internet Wi-Fi Sharing System
+ URL:=http://localhost/
endef
define Package/pisa/Default/description
@@ -25,36 +25,36 @@
define Package/pisa
$(call Package/pisa/Default)
- DEPENDS:=+libconfig +libopenssl +pisa-mobile-guest +pisa-trust-point
+ DEPENDS:=+libconfig +libopenssl +pisa-mobile-guest +pisa-trust-point
endef
CONFIGURE_VARS += \
- CPPFLAGS="$$$$CPPFLAGS \
- -I$(STAGING_DIR)/usr/include/libconfig \
- -I$(PKG_BUILD_DIR)/include"
+ CPPFLAGS="$$$$CPPFLAGS \
+ -I$(STAGING_DIR)/usr/include/libconfig \
+ -I$(PKG_BUILD_DIR)/include"
define Build/Configure
- $(CONFIGURE_VARS);
+ $(CONFIGURE_VARS);
- $(call Build/Configure/Default, --enable-shared \
- --host=$(GNU_TARGET_NAME) --target=$(GNU_TARGET_NAME));
+ $(call Build/Configure/Default, --enable-shared \
+ --host=$(GNU_TARGET_NAME) --target=$(GNU_TARGET_NAME));
endef
define Build/Compile
- ($(CONFIGURE_VARS) \
- $(MAKE) -C $(PKG_BUILD_DIR));
+ ($(CONFIGURE_VARS) \
+ $(MAKE) -C $(PKG_BUILD_DIR));
- $(MAKE) -C $(PKG_BUILD_DIR) \
- DESTDIR="$(PKG_INSTALL_DIR)" \
- INSTALL="install -c" \
- install
+ $(MAKE) -C $(PKG_BUILD_DIR) \
+ DESTDIR="$(PKG_INSTALL_DIR)" \
+ INSTALL="install -c" \
+ install
endef
define Package/libpisa
$(call Package/pisa/Default)
- TITLE:=PISA common libraries
- CATEGORY:=Libraries
- DEPENDS:=+libconfig
+ TITLE:=PISA common libraries
+ CATEGORY:=Libraries
+ DEPENDS:=+libconfig
endef
define Package/libpisa/description
@@ -62,15 +62,15 @@
endef
define Package/libpisa/install
- $(INSTALL_DIR) $(1)/usr/lib/
+ $(INSTALL_DIR) $(1)/usr/lib/
- cp -d $(PKG_INSTALL_DIR)/usr/lib/libpisa.so* $(1)/usr/lib/
+ cp -d $(PKG_INSTALL_DIR)/usr/lib/libpisa.so* $(1)/usr/lib/
endef
define Package/pisa-beacon
$(call Package/pisa/Default)
- TITLE:=PISA beacon application
- DEPENDS:=+libpisa
+ TITLE:=PISA beacon application
+ DEPENDS:=+libpisa
endef
define Package/pisa-beacon/description
@@ -78,17 +78,17 @@
endef
define Package/pisa-beacon/install
- $(INSTALL_DIR) $(1)/etc/init.d
- $(INSTALL_DIR) $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/etc/init.d
+ $(INSTALL_DIR) $(1)/usr/sbin/
- $(INSTALL_BIN) ./files/pisabeacon.init $(1)/etc/init.d/pisabeacon
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pisabeacon $(1)/usr/sbin/
+ $(INSTALL_BIN) ./files/pisabeacon.init $(1)/etc/init.d/pisabeacon
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pisabeacon $(1)/usr/sbin/
endef
define Package/pisa-mobile-guest
$(call Package/pisa/Default)
- TITLE:=PISA mobile guest applications
- DEPENDS:=+libpisa
+ TITLE:=PISA mobile guest applications
+ DEPENDS:=+libpisa
endef
define Package/pisa-mobile-guest/description
@@ -96,19 +96,19 @@
endef
define Package/pisa-mobile-guest/install
- $(INSTALL_DIR) $(1)/etc/init.d
- $(INSTALL_DIR) $(1)/etc/pisa/
- $(INSTALL_DIR) $(1)/usr/sbin/
-
- $(INSTALL_BIN) ./files/pisacd.init $(1)/etc/init.d/pisacd
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/pisa/pisacd.conf
$(1)/etc/pisa/pisacd.conf
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pisacd $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/etc/init.d
+ $(INSTALL_DIR) $(1)/etc/pisa/
+ $(INSTALL_DIR) $(1)/usr/sbin/
+
+ $(INSTALL_BIN) ./files/pisacd.init $(1)/etc/init.d/pisacd
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/pisa/pisacd.conf
$(1)/etc/pisa/pisacd.conf
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pisacd $(1)/usr/sbin/
endef
define Package/pisa-trust-point
$(call Package/pisa/Default)
- TITLE:=PISA trust point applications
- DEPENDS:=+libpisa
+ TITLE:=PISA trust point applications
+ DEPENDS:=+libpisa
endef
define Package/pisa-trust-point/description
@@ -116,13 +116,13 @@
endef
define Package/pisa-trust-point/install
- $(INSTALL_DIR) $(1)/etc/init.d
- $(INSTALL_DIR) $(1)/etc/pisa/
- $(INSTALL_DIR) $(1)/usr/sbin/
-
- $(INSTALL_BIN) ./files/pisasd.init $(1)/etc/init.d/pisasd
- $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/pisa/pisasd.conf
$(1)/etc/pisa/pisasd.conf
- $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pisasd $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/etc/init.d
+ $(INSTALL_DIR) $(1)/etc/pisa/
+ $(INSTALL_DIR) $(1)/usr/sbin/
+
+ $(INSTALL_BIN) ./files/pisasd.init $(1)/etc/init.d/pisasd
+ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/pisa/pisasd.conf
$(1)/etc/pisa/pisasd.conf
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/pisasd $(1)/usr/sbin/
endef
$(eval $(call BuildPackage,pisa))
Modified: trunk/openwrt/package/pisa/files/pisabeacon.init
==============================================================================
--- trunk/openwrt/package/pisa/files/pisabeacon.init Fri Nov 20 15:19:06
2009 (r1737)
+++ trunk/openwrt/package/pisa/files/pisabeacon.init Fri Nov 20 16:30:16
2009 (r1738)
@@ -6,19 +6,19 @@
STOP=66
NET=$(ifconfig | grep br-lan -A 1 | grep 'inet addr' | cut -c 21- |
-awk '{print $1}' | cut -d. -f 1-3)
-GEOID=$(ifconfig | grep eth1 -A 1 | grep 'inet addr' | cut -c 21- |
-awk '{print $1}' | cut -d. -f 4)
+ awk '{print $1}' | cut -d. -f 1-3)
+GEOID=$(ifconfig | grep eth1 -A 1 | grep 'inet addr' | cut -c 21- |
+ awk '{print $1}' | cut -d. -f 4)
PISABEACON_OPTS="-bd $NET.255 -g "$GEOID
start() {
- echo -n "Starting pisabeacon with geoid" $GEOID
- pisabeacon $PISABEACON_OPTS > /dev/null
- echo "."
+ echo -n "Starting pisabeacon with geoid" $GEOID
+ pisabeacon $PISABEACON_OPTS > /dev/null
+ echo "."
}
stop() {
- echo -n "Stopping pisabeacon"
- killall pisabeacon
- echo "."
+ echo -n "Stopping pisabeacon"
+ killall pisabeacon
+ echo "."
}
Modified: trunk/openwrt/package/pisa/files/pisacd.init
==============================================================================
--- trunk/openwrt/package/pisa/files/pisacd.init Fri Nov 20 15:19:06
2009 (r1737)
+++ trunk/openwrt/package/pisa/files/pisacd.init Fri Nov 20 16:30:16
2009 (r1738)
@@ -8,13 +8,13 @@
PISACD_OPTS="-b"
start() {
- echo -n "Starting pisacd"
- pisacd ${PISACD_OPTS}
- echo "."
+ echo -n "Starting pisacd"
+ pisacd ${PISACD_OPTS}
+ echo "."
}
stop() {
- echo -n "Stopping pisacd"
- killall pisacd
- echo "."
+ echo -n "Stopping pisacd"
+ killall pisacd
+ echo "."
}
Modified: trunk/openwrt/package/pisa/files/pisasd.init
==============================================================================
--- trunk/openwrt/package/pisa/files/pisasd.init Fri Nov 20 15:19:06
2009 (r1737)
+++ trunk/openwrt/package/pisa/files/pisasd.init Fri Nov 20 16:30:16
2009 (r1738)
@@ -8,13 +8,13 @@
PISASD_OPTS="-b"
start() {
- echo -n "Starting pisasd"
- pisasd ${PISASD_OPTS}
- echo "."
+ echo -n "Starting pisasd"
+ pisasd ${PISASD_OPTS}
+ echo "."
}
stop() {
- echo -n "Stopping pisasd"
- killall pisasd
- echo "."
+ echo -n "Stopping pisasd"
+ killall pisasd
+ echo "."
}
Modified: trunk/openwrt/router-configurations/eros/etc/config/wireless
==============================================================================
--- trunk/openwrt/router-configurations/eros/etc/config/wireless Fri Nov
20 15:19:06 2009 (r1737)
+++ trunk/openwrt/router-configurations/eros/etc/config/wireless Fri Nov
20 16:30:16 2009 (r1738)
@@ -1,7 +1,7 @@
config wifi-device wlan0
option type mac80211
option channel 5
- option macaddr 00:0F:A3:1A:11:91
+ option macaddr 00:0F:A3:1A:11:91
config wifi-iface
option device wlan0
Modified: trunk/openwrt/template-asus-wl500w/etc/config/wireless
==============================================================================
--- trunk/openwrt/template-asus-wl500w/etc/config/wireless Fri Nov 20
15:19:06 2009 (r1737)
+++ trunk/openwrt/template-asus-wl500w/etc/config/wireless Fri Nov 20
16:30:16 2009 (r1738)
@@ -1,7 +1,7 @@
config wifi-device wlan0
option type mac80211
option channel ##ROUTER_CHANNEL##
- option macadd ##ROUTER_WIFI_MAC##
+ option macadd ##ROUTER_WIFI_MAC##
config wifi-iface
option device wlan0
Modified: trunk/openwrt/template-linksys-wrt160nl/etc/config/wireless
==============================================================================
--- trunk/openwrt/template-linksys-wrt160nl/etc/config/wireless Fri Nov 20
15:19:06 2009 (r1737)
+++ trunk/openwrt/template-linksys-wrt160nl/etc/config/wireless Fri Nov 20
16:30:16 2009 (r1738)
@@ -3,9 +3,9 @@
option channel ##ROUTER_CHANNEL##
option macaddr ##ROUTER_WIFI_MAC##
option hwmode_11n g
- #option ht_capab '[SHORT-GI-40][DSSS_CCK-40][HT40-][HT40+][HT20]'
- option ht_capab '[HT20]'
-
+ #option ht_capab '[SHORT-GI-40][DSSS_CCK-40][HT40-][HT40+][HT20]'
+ option ht_capab '[HT20]'
+
config wifi-iface
option device wlan0
option network lan
Modified: trunk/tools/NokiaN810_BEX_Perf.sh
==============================================================================
--- trunk/tools/NokiaN810_BEX_Perf.sh Fri Nov 20 15:19:06 2009 (r1737)
+++ trunk/tools/NokiaN810_BEX_Perf.sh Fri Nov 20 16:30:16 2009 (r1738)
@@ -1,24 +1,25 @@
#!/bin/sh
-# Written by Sebastian Agethen
-# Performs a HIPL Base-Exchange utilizing conntest-client-hip
-# conntest-server needs to be running on the target host.
+# Written by Sebastian Agethen
+# Performs a HIPL Base-Exchange utilizing conntest-client-hip
+# conntest-server needs to be running on the target host.
CMDLINEPARAM=4
-if [ $# -ge $CMDLINEPARAM ]
-then
- echo "Starting with $3 loops."
+if [ $# -ge $CMDLINEPARAM ]; then
+ echo "Starting with $3 loops."
else
- echo "Usage $(basename $0) host port number_of_loops sleep_time"
- exit $E_BADARGS
+ echo "Usage $(basename $0) host port number_of_loops sleep_time"
+ exit $E_BADARGS
fi
+
x=$(date +%s)
-for a in $(seq $3)
-do
-conntest-client-hip $1 tcp $2 < /dev/null > /dev/null 2> /dev/null
-hipconf rst all >/dev/null 2>/dev/null
-sleep $4
-echo "Try #$a completed"
+
+for a in $(seq $3); do
+ conntest-client-hip $1 tcp $2 < /dev/null > /dev/null 2> /dev/null
+ hipconf rst all >/dev/null 2>/dev/null
+ sleep $4
+ echo "Try #$a completed"
done
+
y=$(date +%s)
z=$(($y-$x))
echo "------------------------------------"
Modified: trunk/tools/autoupdater.sh
==============================================================================
--- trunk/tools/autoupdater.sh Fri Nov 20 15:19:06 2009 (r1737)
+++ trunk/tools/autoupdater.sh Fri Nov 20 16:30:16 2009 (r1738)
@@ -58,19 +58,19 @@
cd $BASE_DIR
for FILE in $HIPL_FILES; do
- echo "get "$REMOTE_HIPL_DIR$FILE" "$BASE_DIR >> files_to_copy
+ echo "get "$REMOTE_HIPL_DIR$FILE" "$BASE_DIR >> files_to_copy
done
for FILE in $PISA_FILES; do
- echo "get "$REMOTE_PISA_DIR$FILE" "$BASE_DIR >> files_to_copy
+ echo "get "$REMOTE_PISA_DIR$FILE" "$BASE_DIR >> files_to_copy
done
for FILE in $CUSTOM_FILES; do
- if [ ! -e "$BASE_DIR$FILE" ]; then
- echo "get "$REMOTE_CUSTOM_DIR$FILE" "$BASE_DIR >> files_to_copy
- else
- echo "Local config file "$BASE_DIR$FILE" already exists.
Skipping!"
- fi
+ if [ ! -e "$BASE_DIR$FILE" ]; then
+ echo "get "$REMOTE_CUSTOM_DIR$FILE" "$BASE_DIR >> files_to_copy
+ else
+ echo "Local config file "$BASE_DIR$FILE" already exists. Skipping!"
+ fi
done
# We want to exit the sftp client, right!?
Modified: trunk/tools/caphip.sh
==============================================================================
--- trunk/tools/caphip.sh Fri Nov 20 15:19:06 2009 (r1737)
+++ trunk/tools/caphip.sh Fri Nov 20 16:30:16 2009 (r1738)
@@ -11,13 +11,13 @@
IFNAME="eth0"
usage() {
- echo "Usage: $0 [options]"
- echo " Options:"
- echo " -i ifname: use ifname as network interface (default: eth0)"
- echo " -o output: save output as file name 'output' (default:
${OUTPUT_FILE})"
- echo " -h : this help"
+ echo "Usage: $0 [options]"
+ echo " Options:"
+ echo " -i ifname: use ifname as network interface (default: eth0)"
+ echo " -o output: save output as file name 'output' (default:
${OUTPUT_FILE})"
+ echo " -h : this help"
- exit 0
+ exit 0
}
args=$(getopt hi:o: $*)
@@ -25,9 +25,9 @@
while getopts "hi:o:" FLAG; do
case $FLAG in
- h) usage ;;
- i) IFNAME=$OPTARG ;;
- o) OUTPUT_FILE=$OPTARG ;;
+ h) usage ;;
+ i) IFNAME=$OPTARG ;;
+ o) OUTPUT_FILE=$OPTARG ;;
esac
done
Modified: trunk/tools/convenience-scripts/documentation.txt
==============================================================================
--- trunk/tools/convenience-scripts/documentation.txt Fri Nov 20 15:19:06
2009 (r1737)
+++ trunk/tools/convenience-scripts/documentation.txt Fri Nov 20 16:30:16
2009 (r1738)
@@ -6,7 +6,7 @@
*************
hipdump - No parameters
-Dumps all hip-traffic via tcpdump to a file for later analysis with a patched
+Dumps all hip-traffic via tcpdump to a file for later analysis with a patched
version of wireshark.
hiptest - No parameters
@@ -16,9 +16,9 @@
hipmyconfig [ipv4|ipv6]
Sets certain options (opendht off, opp off) for initiator and responder. Also
adds mappings for HITs based on what type of connection is desired:
- ipv6 - Ethernet(IPv6(HIP)) - no NAT
- ipv4 - Ethernet(IPv4(HIP)) - no NAT
- * - Ethernet(IPv4(UDP(HIP))) - with NAT
+ ipv6 - Ethernet(IPv6(HIP)) - no NAT
+ ipv4 - Ethernet(IPv4(HIP)) - no NAT
+ * - Ethernet(IPv4(UDP(HIP))) - with NAT
Defaults to IPv4 with NAT, if no parameter is specified
hipconnect - No parameters
@@ -34,9 +34,9 @@
Example:
********
-I use multiple shells at each host, because hiptest and hipdump run the whole
-time. For simplicity and better overview I use screen to manage all shells in
-the same window.
+I use multiple shells at each host, because hiptest and hipdump run the whole
+time. For simplicity and better overview I use screen to manage all shells in
+the same window.
@pisa1-shell1: hiptest
@pisa2-shell1: hiptest
@@ -51,7 +51,7 @@
At the end of a test just kill all processes still running mit ctrl-c. Log
files and tcpdump output are then ready to be analyzed. Running processes
-usually include hiptest on all machines and hipdump on all machines. Note that
+usually include hiptest on all machines and hipdump on all machines. Note that
it is sufficient to run hipdump only on the firewall box if you don't want to
debug routing issues, as each packet is saved twice in the tcpdump output
file: once before and once after modification by the firewall.
Modified: trunk/tools/convenience-scripts/hipconnect.sh
==============================================================================
--- trunk/tools/convenience-scripts/hipconnect.sh Fri Nov 20 15:19:06
2009 (r1737)
+++ trunk/tools/convenience-scripts/hipconnect.sh Fri Nov 20 16:30:16
2009 (r1738)
@@ -2,23 +2,16 @@
. ./tools.conf
-if [ $(hostname) = $HOSTNAME_INITIATOR ]
-then
-
-echo "Press ENTER to start pinging"
-read REPLY
-echo "From $HIT_INITIATOR"
-echo "to $HIT_RESPONDER"
-echo " "
-
-
-
-killall ping6
-ping6 -I $HIT_INITIATOR $HIT_RESPONDER
+if [ $(hostname) = $HOSTNAME_INITIATOR ]; then
+ echo "Press ENTER to start pinging"
+ read REPLY
+ echo "From $HIT_INITIATOR"
+ echo "to $HIT_RESPONDER"
+ echo " "
+ killall ping6
+ ping6 -I $HIT_INITIATOR $HIT_RESPONDER
else
-
-echo "You are not the initiator ($HOSTNAME_INITIATOR)"
-
+ echo "You are not the initiator ($HOSTNAME_INITIATOR)"
fi
Modified: trunk/tools/convenience-scripts/hipmyconfig.sh
==============================================================================
--- trunk/tools/convenience-scripts/hipmyconfig.sh Fri Nov 20 15:19:06
2009 (r1737)
+++ trunk/tools/convenience-scripts/hipmyconfig.sh Fri Nov 20 16:30:16
2009 (r1738)
@@ -2,37 +2,37 @@
. ./tools.conf
-case $( hostname ) in
- $HOSTNAME_INITIATOR)
- cd $DIR_HIP
- tools/hipconf opendht off
- tools/hipconf set opp off
- case "$1" in
- "ipv6")
- echo " >> setting up IPv6 scenario"
- tools/hipconf add map $HIT_RESPONDER $IP6_RESPONDER
- ;;
- "ipv4")
- echo " >> setting up IPv4 scenario (no NAT)"
- tools/hipconf add map $HIT_RESPONDER $IP4_RESPONDER
+case $(hostname) in
+ $HOSTNAME_INITIATOR)
+ cd $DIR_HIP
+ tools/hipconf opendht off
+ tools/hipconf set opp off
+ case "$1" in
+ "ipv6")
+ echo " >> setting up IPv6 scenario"
+ tools/hipconf add map $HIT_RESPONDER $IP6_RESPONDER
+ ;;
+ "ipv4")
+ echo " >> setting up IPv4 scenario (no NAT)"
+ tools/hipconf add map $HIT_RESPONDER $IP4_RESPONDER
+ ;;
+ *)
+ echo " >> setting up IPv4 scenario (with NAT)"
+ tools/hipconf nat on
+ tools/hipconf add map $HIT_RESPONDER $IP4_RESPONDER
+ ;;
+ esac
+ ;;
+ $HOSTNAME_MIDDLEBOX)
+ ;;
+ $HOSTNAME_RESPONDER)
+ cd $DIR_HIP
+ tools/hipconf opendht off
+ tools/hipconf set opp off
+ ;;
+ *)
+ echo "unknown hostname"
;;
- *)
- echo " >> setting up IPv4 scenario (with NAT)"
- tools/hipconf nat on
- tools/hipconf add map $HIT_RESPONDER $IP4_RESPONDER
- ;;
- esac
- ;;
- $HOSTNAME_MIDDLEBOX)
- ;;
- $HOSTNAME_RESPONDER)
- cd $DIR_HIP
- tools/hipconf opendht off
- tools/hipconf set opp off
- ;;
- *)
- echo "unknown hostname"
- ;;
esac
echo "Press enter to exit"
Modified: trunk/tools/convenience-scripts/hipscreen
==============================================================================
--- trunk/tools/convenience-scripts/hipscreen Fri Nov 20 15:19:06 2009
(r1737)
+++ trunk/tools/convenience-scripts/hipscreen Fri Nov 20 16:30:16 2009
(r1738)
@@ -1,6 +1,6 @@
-split
+split
screen -t conf 1 ./hipmyconfig
screen -t ping 2 ./hipconnect
focus
@@ -15,5 +15,5 @@
bindkey -m "^[[5;2~" stuff ^b
bindkey -m "^[[6;2~" stuff ^f
-hardstatus alwayslastline
+hardstatus alwayslastline
hardstatus string "%{.bW}%-w%{.rW}%n %t%{-}%+w %=%{..G} %H %{..Y} %m/%d %c "
Modified: trunk/tools/convenience-scripts/hipswitchip.sh
==============================================================================
--- trunk/tools/convenience-scripts/hipswitchip.sh Fri Nov 20 15:19:06
2009 (r1737)
+++ trunk/tools/convenience-scripts/hipswitchip.sh Fri Nov 20 16:30:16
2009 (r1738)
@@ -2,24 +2,23 @@
. ./tools.conf
-if [ $(whoami) != "root" ]
-then
- echo "You must be root."
- exit 1
+if [ $(whoami) != "root" ]; then
+ echo "You must be root."
+ exit 1
fi
case $1 in
- "set")
- ip -6 add add $IP6_ALTERNATIVE_INITIATOR dev eth0
- ip -6 add del $IP6_INITIATOR/64 dev eth0
- ;;
- "reset")
- ip -6 add add $IP6_INITOATOR/64 dev eth0
- ip -6 add del $IP6_ALTERNATIVE_INITIATOR dev eth0
- ;;
- *)
- echo "unknown command, usage: $0 set|reset"
- ;;
+ "set")
+ ip -6 add add $IP6_ALTERNATIVE_INITIATOR dev eth0
+ ip -6 add del $IP6_INITIATOR/64 dev eth0
+ ;;
+ "reset")
+ ip -6 add add $IP6_INITOATOR/64 dev eth0
+ ip -6 add del $IP6_ALTERNATIVE_INITIATOR dev eth0
+ ;;
+ *)
+ echo "unknown command, usage: $0 set|reset"
+ ;;
esac
Modified: trunk/tools/convenience-scripts/hiptest.sh
==============================================================================
--- trunk/tools/convenience-scripts/hiptest.sh Fri Nov 20 15:19:06 2009
(r1737)
+++ trunk/tools/convenience-scripts/hiptest.sh Fri Nov 20 16:30:16 2009
(r1738)
@@ -2,32 +2,30 @@
echo "This script starts the hipd or the firewall and logs the result to the
logfile"
-
-if [ $(whoami) != "root" ]
-then
- echo "You must be root."
- exit 1
+if [ $(whoami) != "root" ]; then
+ echo "You must be root."
+ exit 1
fi
. ./tools.conf
-case $( hostname ) in
- $HOSTNAME_INITIATOR)
- cd $DIR_HIP
- hipd/hipd -k 2>&1 |tee $DIR_TRACES/initiator.log
- ;;
- $HOSTNAME_MIDDLEBOX)
- cd $DIR_HIP
- killalll firewall
- firewall/firewall -d -m 2>&1 |tee $DIR_TRACES/firewall.log
- ;;
- $HOSTNAME_RESPONDER)
- cd $DIR_HIP
- hipd/hipd -k 2>&1 |tee $DIR_TRACES/responder.log
- ;;
- *)
- echo "unknown hostname"
- ;;
+case $(hostname) in
+ $HOSTNAME_INITIATOR)
+ cd $DIR_HIP
+ hipd/hipd -k 2>&1 |tee $DIR_TRACES/initiator.log
+ ;;
+ $HOSTNAME_MIDDLEBOX)
+ cd $DIR_HIP
+ killalll firewall
+ firewall/firewall -d -m 2>&1 |tee $DIR_TRACES/firewall.log
+ ;;
+ $HOSTNAME_RESPONDER)
+ cd $DIR_HIP
+ hipd/hipd -k 2>&1 |tee $DIR_TRACES/responder.log
+ ;;
+ *)
+ echo "unknown hostname"
+ ;;
esac
Modified: trunk/tools/convenience-scripts/tools.conf.template
==============================================================================
--- trunk/tools/convenience-scripts/tools.conf.template Fri Nov 20 15:19:06
2009 (r1737)
+++ trunk/tools/convenience-scripts/tools.conf.template Fri Nov 20 16:30:16
2009 (r1738)
@@ -1,5 +1,5 @@
# Config file for HIP and PISA testing tools
-#
+#
# Adjust the contents of this file and copy it to
# tools.conf
# DO NOT CHECK IN YOUR COPY INTO SVN
Modified: trunk/tools/delroute.sh
==============================================================================
--- trunk/tools/delroute.sh Fri Nov 20 15:19:06 2009 (r1737)
+++ trunk/tools/delroute.sh Fri Nov 20 16:30:16 2009 (r1738)
@@ -8,17 +8,17 @@
rt_entries=$(route -n |grep $device)
if [ "x$rt_entries" = "x" ]; then
- exit 0
+ exit 0
fi
-echo "$rt_entries" |
+echo "$rt_entries" |
while read line; do
- target=$(echo $line | awk '{print $1}')
- netmask=$(echo $line | awk '{print $3}')
+ target=$(echo $line | awk '{print $1}')
+ netmask=$(echo $line | awk '{print $3}')
- echo "Removing target $target(netmask $netmask) from the routing
table..."
+ echo "Removing target $target(netmask $netmask) from the routing table..."
- route del -net $target netmask $netmask dev $device
+ route del -net $target netmask $netmask dev $device
done
exit 0
Modified: trunk/tools/packaging/create-package.sh
==============================================================================
--- trunk/tools/packaging/create-package.sh Fri Nov 20 15:19:06 2009
(r1737)
+++ trunk/tools/packaging/create-package.sh Fri Nov 20 16:30:16 2009
(r1738)
@@ -40,7 +40,7 @@
REPO_USER=pisa
REPO_GROUP=pisa
SPECFILE_DIR=$(mktemp -d)
-SPECFILE=$SPECFILE_DIR/pisa.spec
+SPECFILE=$SPECFILE_DIR/pisa.spec
die()
{
@@ -57,18 +57,15 @@
build_rpm()
{
test -e ~/.rpmmacros && echo "Warning: ~/.rpmmacros found, could be a
problem"
- if test -e ~/rpmbuild
- then
- echo "Warning: ~/rpmbuild found, could be a problem"
- echo "It should be a link to /usr/src/redhat"
+ if test -e ~/rpmbuild; then
+ echo "Warning: ~/rpmbuild found, could be a problem"
+ echo "It should be a link to /usr/src/redhat"
fi
- for SUBDIR in $SUBRPMDIRS
- do
- if test ! -d $RPMDIR/$SUBDIR
- then
- $SUDO mkdir -p $RPMDIR/$SUBDIR
- fi
+ for SUBDIR in $SUBRPMDIRS; do
+ if test ! -d $RPMDIR/$SUBDIR; then
+ $SUDO mkdir -p $RPMDIR/$SUBDIR
+ fi
done
# The RPMs can be found from /usr/src/redhat/ SRPMS and RPMS
@@ -78,9 +75,8 @@
mkindex_rpm()
{
- if test ! -d $PKG_INDEX
- then
- mkdir $PKG_INDEX
+ if test ! -d $PKG_INDEX; then
+ mkdir $PKG_INDEX
fi
#$SUDO createrepo --update --outputdir=$PKG_INDEX_DIR $PKG_DIR
$SUDO createrepo --outputdir=$PKG_INDEX_DIR $PKG_DIR
@@ -92,9 +88,9 @@
cd $PKG_DIR
WD=$(echo $PKG_WEB_DIR | sed 's/\//\\\\\//g')
#dpkg-scanpackages --multiversion . |
- dpkg-scanpackages . | \
- sed "s/Filename: \./Filename: $WD/" | \
- gzip -9c > $PKG_INDEX
+ dpkg-scanpackages . |
+ sed "s/Filename: \./Filename: $WD/" |
+ gzip -9c > $PKG_INDEX
cd $ORIG
}
@@ -112,14 +108,12 @@
#rsync $RSYNC_OPTS ${REPO_USER}@${REPO_SERVER}:$PKG_SERVER_DIR/ $PKG_DIR/
# build index of all packages
- if test x"$DISTROBASE" = x"debian"
- then
- mkindex_deb
- elif test x"$DISTROBASE" = x"redhat"
- then
- mkindex_rpm
+ if test x"$DISTROBASE" = x"debian"; then
+ mkindex_deb
+ elif test x"$DISTROBASE" = x"redhat"; then
+ mkindex_rpm
else
- die "Unhandled distro $DISTROBASE"
+ die "Unhandled distro $DISTROBASE"
fi
# Delete old packages from the repo
@@ -134,30 +128,25 @@
build_deb()
{
- if dpkg --print-architecture|grep -q armel
- then
- build_maemo_deb
- exit 0
+ if dpkg --print-architecture|grep -q armel; then
+ build_maemo_deb
+ exit 0
fi
test -e ~/.debmacros && echo "Warning: ~/.debmacros found, could be a
problem"
- if test -e ~/debbuild
- then
- echo "Warning: ~/debbuild found, could be a problem"
- echo "It should be a link to /usr/src/debian"
- fi
-
- if test ! -x /usr/bin/pax
- then
- die "pax cannot be found. Please do \"apt-get install pax\"."
- fi
-
- for SUBDIR in $SUBDEBDIRS
- do
- if test ! -d $DEBDIR/$SUBDIR
- then
- mkdir -p $DEBDIR/$SUBDIR
- fi
+ if test -e ~/debbuild; then
+ echo "Warning: ~/debbuild found, could be a problem"
+ echo "It should be a link to /usr/src/debian"
+ fi
+
+ if test ! -x /usr/bin/pax; then
+ die "pax cannot be found. Please do \"apt-get install pax\"."
+ fi
+
+ for SUBDIR in $SUBDEBDIRS; do
+ if test ! -d $DEBDIR/$SUBDIR; then
+ mkdir -p $DEBDIR/$SUBDIR
+ fi
done
cp $SPECFILE $DEBDIR/SPECS
@@ -175,11 +164,10 @@
echo "Release: 1" >> $SPECFILE
# Set architecture, distro and repo details
-if test -r /etc/debian_version
-then
+if test -r /etc/debian_version; then
DISTROBASE=debian
ARCH=$(dpkg --print-architecture)
- PKG_DIR=$DEBDIR/DEBS/$ARCH
+ PKG_DIR=$DEBDIR/DEBS/$ARCH
DISTRO_RELEASE=$(lsb_release -c|cut -f2)
DISTRO=$(lsb_release -d | cut -f2 | tr '[:upper:]' '[:lower:]' | cut -d" "
-f1)
PKG_WEB_DIR=dists/$DISTRO_RELEASE/$VERSION/binary-${ARCH}
@@ -190,8 +178,7 @@
PKG_INDEX_NAME=Packages.gz
PKG_INDEX_DIR=$PKGEXE
PKG_INDEX=$PKG_INDEX_DIR/$PKG_INDEX_NAME
-elif test -r /etc/redhat-release
-then
+elif test -r /etc/redhat-release; then
DISTROBASE=redhat
ARCH=$(uname -i)
PKG_DIR=$RPMDIR/RPMS/$ARCH
@@ -212,20 +199,16 @@
TARBALL=$PKGROOT/pisa-${VERSION}.tar.gz
# Determine action
-if test x"$1" = x"syncrepo"
-then
+if test x"$1" = x"syncrepo"; then
syncrepo
exit
-elif test x"$1" = x"bin"
-then
- if test x"$DISTROBASE" = x"redhat"
- then
- BIN_FORMAT=rpm
- elif test x"$DISTROBASE" = x"debian"
- then
- BIN_FORMAT=deb
+elif test x"$1" = x"bin"; then
+ if test x"$DISTROBASE" = x"redhat"; then
+ BIN_FORMAT=rpm
+ elif test x"$DISTROBASE" = x"debian"; then
+ BIN_FORMAT=deb
else
- die "Unknown distro"
+ die "Unknown distro"
fi
fi
echo "Architecture: $ARCH"
@@ -259,11 +242,9 @@
echo "*** Cleaning up ${DEBDIR} ***"
rm -rf ${DEBDIR}
-if test x"$1" = x"rpm" || test x"$BIN_FORMAT" = x"rpm"
-then
+if test x"$1" = x"rpm" || test x"$BIN_FORMAT" = x"rpm"; then
build_rpm
-elif test x"$1" = x"deb" || test x"$BIN_FORMAT" = x"deb"
-then
+elif test x"$1" = x"deb" || test x"$BIN_FORMAT" = x"deb"; then
build_deb
else
die "*** Unknown platform, aborting ***"
Modified: trunk/tools/packaging/debbuild
==============================================================================
--- trunk/tools/packaging/debbuild Fri Nov 20 15:19:06 2009 (r1737)
+++ trunk/tools/packaging/debbuild Fri Nov 20 16:30:16 2009 (r1738)
@@ -28,8 +28,8 @@
use strict;
use warnings;
-use Fcntl; # for sysopen flags
-use Cwd 'abs_path'; # for finding where files really are
+use Fcntl; # for sysopen flags
+use Cwd 'abs_path'; # for finding where files really are
use Config;
# regex debugger
@@ -55,13 +55,13 @@
# default is /usr/src/debian/{BUILD,SOURCES,SPECS,DEBS,SDEBS}
# Globals
-my $finalmessages = ''; # A place to stuff messages that I want printed
at the *very* end of any processing.
+my $finalmessages = ''; # A place to stuff messages that I want printed at the
*very* end of any processing.
my $specfile;
my $tarball;
my $srcpkg;
my $cmdbuildroot;
-my $tarballdir = '%{name}-%{version}'; # We do this in case of a spec file not
using %setup...
-my %specglobals; # For %define's in specfile, among other things.
+my $tarballdir = '%{name}-%{version}'; # We do this in case of a spec file
not using %setup...
+my %specglobals; # For %define's in specfile, among other things.
$specglobals{'_vendor'} = 'debbuild';
$specglobals{'vendor'} = 'debbuild';
@@ -70,41 +70,41 @@
my $verbosity = 0;
my $NoAutoReq = 0;
my %cmdopts = (type => '',
- stage => 'a',
- short => 'n'
- );
+ stage => 'a',
+ short => 'n'
+ );
my $topdir = "/usr/src/debian";
#my $specglobals{buildroot} =
"%{_tmppath}/%{name}-%{version}-%{release}.root".int(rand(99998)+1);
$specglobals{buildroot} = '';
# "Constants"
my %targets = ('p' => 'Prep',
- 'c' => 'Compile',
- 'i' => 'Install',
- 'l' => 'Verify %files',
- 'a' => 'Build binary and source',
- 'b' => 'Build binary',
- 's' => 'Build source'
- );
+ 'c' => 'Compile',
+ 'i' => 'Install',
+ 'l' => 'Verify %files',
+ 'a' => 'Build binary and source',
+ 'b' => 'Build binary',
+ 's' => 'Build source'
+ );
# Ah, the joys of multiple architectures. :( Feh.
# As copied from rpm
-my %optflags = ( 'i386' => '-O2 -g -march=i386 -mcpu=i686',
- 'amd64' => '-O2 -g'
- );
-my $hostarch; # we set this later...
+my %optflags = ( 'i386' => '-O2 -g -march=i386 -mcpu=i686',
+ 'amd64' => '-O2 -g'
+ );
+my $hostarch; # we set this later...
my $scriptletbase;
# Hackery to try to bring some semblance of sanity to packages built for more
# than one Debian version at the same time. Whee.
# /etc/debian-version
my %distmap = (
- "3.1.9ubuntu7.1" => "dapper",
- "4ubuntu2" => "feisty",
- "3.0" => "woody",
- "3.1" => "sarge",
- "4" => "etch",
- "4.0" => "lenny",
- "4.0.0" => "sid");
+ "3.1.9ubuntu7.1" => "dapper",
+ "4ubuntu2" => "feisty",
+ "3.0" => "woody",
+ "3.1" => "sarge",
+ "4" => "etch",
+ "4.0" => "lenny",
+ "4.0.0" => "sid");
# Enh. There doesn't seem to be any better way to do this... :(
{
my $basever = qx { dpkg-query --showformat '\${version}' -W base-files };
@@ -116,17 +116,17 @@
chomp $releasever;
$specglobals{"debdist"} = $distmap{$basever};
- $specglobals{"debver"} = $basever; # this may have trouble with Ubuntu
versions?
+ $specglobals{"debver"} = $basever; # this may have trouble with Ubuntu
versions?
}
# Package data
# This is the form of $pkgdata{pkgname}{meta}
# meta includes Summary, Name, Version, Release, Group, Copyright,
-# Source, URL, Packager, BuildRoot, Description, BuildRequires,
-# Requires, Provides
+# Source, URL, Packager, BuildRoot, Description, BuildRequires,
+# Requires, Provides
# 10/31/2005 Maybe this should be flatter? -kgd
my %pkgdata;
-my @pkglist = ('main'); #sigh
+my @pkglist = ('main'); #sigh
# Files listing. Embedding this in %pkgdata would be, um, messy.
my %filelist;
my %doclist;
@@ -197,16 +197,16 @@
$pkgdata{$pkg}{name} =~ tr/_/-/;
my $pkgfullname = "$pkgdata{$pkg}{name}_".
- (defined($pkgdata{main}{epoch}) ? "$pkgdata{main}{epoch}:" : '').
-
"$pkgdata{$pkg}{version}-$pkgdata{main}{release}_$pkgdata{$pkg}{arch}.deb";
+ (defined($pkgdata{main}{epoch}) ? "$pkgdata{main}{epoch}:" : '').
+
"$pkgdata{$pkg}{version}-$pkgdata{main}{release}_$pkgdata{$pkg}{arch}.deb";
print "$pkgfullname\n" if $filelist{$pkg};
}
# Source package
print "$pkgdata{main}{name}-".
- (defined($pkgdata{main}{epoch}) ? "$pkgdata{main}{epoch}:" : '').
- "$pkgdata{main}{version}-$pkgdata{main}{release}.sdeb\n";
+ (defined($pkgdata{main}{epoch}) ? "$pkgdata{main}{epoch}:" : '').
+ "$pkgdata{main}{version}-$pkgdata{main}{release}.sdeb\n";
exit 0;
}
@@ -250,8 +250,8 @@
$tarball = abs_path($tarball);
my $unpackcmd = "cd $topdir/BUILD; tar -".
- ( $tarball =~ /\.tar\.gz$/ ? "z" : "" ).
- ( $tarball =~ /\.tar\.bz2$/ ? "j" : "" ). "xf $tarball";
+ ( $tarball =~ /\.tar\.gz$/ ? "z" : "" ).
+ ( $tarball =~ /\.tar\.bz2$/ ? "j" : "" ). "xf $tarball";
system "$unpackcmd";
system "cp $tarball $topdir/SOURCES/$fileonly";
system "cp $specfile $topdir/SPECS/";
@@ -314,13 +314,13 @@
while (<USERMACROS>) {
# And we also only handle a few macros at the moment.
if (/^\%_topdir/) {
- my (undef,$tmp) = split /\s+/, $_;
- $topdir = $tmp;
+ my (undef,$tmp) = split /\s+/, $_;
+ $topdir = $tmp;
}
next if /^\%_/;
# Allow arbitrary definitions. Note that we're only doing simple defs
here for now.
if (/^\%([a-z0-9]+)\s+(.+)$/) {
- $specglobals{$1} = $2;
+ $specglobals{$1} = $2;
}
}
}
@@ -347,41 +347,41 @@
# Is it a long option?
if (/^--/) {
- if (/^--short-circuit/) {
- $cmdopts{short} = 'y';
- } elsif (/^--rebuild/) {
- $cmdopts{type} = 's';
- } elsif (/^--showpkgs/) {
- $cmdopts{type} = 'd'; # d for 'diagnostic' or 'debug' or 'dump'
- } elsif (/^--buildroot/) {
- # nothing to do? Can't see anything needed, we handle the actual
definition later.
- } elsif (/^--define/) {
- # nothing to do? Can't see anything needed, we handle the actual
definition later.
+ if (/^--short-circuit/) {
+ $cmdopts{short} = 'y';
+ } elsif (/^--rebuild/) {
+ $cmdopts{type} = 's';
+ } elsif (/^--showpkgs/) {
+ $cmdopts{type} = 'd'; # d for 'diagnostic' or 'debug' or 'dump'
+ } elsif (/^--buildroot/) {
+ # nothing to do? Can't see anything needed, we handle the actual
definition later.
+ } elsif (/^--define/) {
+ # nothing to do? Can't see anything needed, we handle the actual
definition later.
##fixme
# add --self-package here
# deps build-essential pax fakeroot
- } else {
- print "Long option $_ not handled\n";
- }
+ } else {
+ print "Long option $_ not handled\n";
+ }
} else {
- # Not a long option
- if (/^-[bt]/) {
- if ($cmdopts{stage} eq 's') {
- # Mutually exclusive options.
- die "Can't use $_ with --rebuild\n";
- } else {
- # Capture the type (from "bare" files or tarball) and the stage
(prep, build, etc)
- ($cmdopts{stage}) = (/^-[bt]([pcilabs])/);
- ($cmdopts{type}) = (/^-([bt])[pcilabs]/);
- }
- } elsif (/^-v/) {
- # bump verbosity. Not sure what I'll actually do here...
- } elsif (/^-i/) {
- $cmdopts{install} = 1;
- $prevopt = '-i';
- } else {
- die "Bad option $_\n";
- }
+ # Not a long option
+ if (/^-[bt]/) {
+ if ($cmdopts{stage} eq 's') {
+ # Mutually exclusive options.
+ die "Can't use $_ with --rebuild\n";
+ } else {
+ # Capture the type (from "bare" files or tarball) and the stage
(prep, build, etc)
+ ($cmdopts{stage}) = (/^-[bt]([pcilabs])/);
+ ($cmdopts{type}) = (/^-([bt])[pcilabs]/);
+ }
+ } elsif (/^-v/) {
+ # bump verbosity. Not sure what I'll actually do here...
+ } elsif (/^-i/) {
+ $cmdopts{install} = 1;
+ $prevopt = '-i';
+ } else {
+ die "Bad option $_\n";
+ }
}
} else { # Not an option argument
@@ -391,30 +391,30 @@
# tarball, or source package we're operating on - depending
# on which one we meet.
if ($prevopt eq '--buildroot') {
- $cmdbuildroot = $_;
+ $cmdbuildroot = $_;
} elsif ($prevopt eq '--define') {
- my ($macro,$value) = (/([a-z0-9_.-]+)(?:\s+(.+))?/i);
- if ($value ne '') {
- $specglobals{$macro} = $value;
- } else {
- warn "WARNING: missing value for macro $macro in --define!
Ignoring.\n";
- }
+ my ($macro,$value) = (/([a-z0-9_.-]+)(?:\s+(.+))?/i);
+ if ($value ne '') {
+ $specglobals{$macro} = $value;
+ } else {
+ warn "WARNING: missing value for macro $macro in --define!
Ignoring.\n";
+ }
} elsif ($prevopt eq '-i') {
- $srcpkg = $_;
+ $srcpkg = $_;
} else {
- if ($cmdopts{type} eq 's') {
- # Source package
- if (!/(sdeb|\.src\.rpm)$/) {
- die "Can't --rebuild with $_\n";
- }
+ if ($cmdopts{type} eq 's') {
+ # Source package
+ if (!/(sdeb|\.src\.rpm)$/) {
+ die "Can't --rebuild with $_\n";
+ }
$srcpkg = $_;
- } elsif ($cmdopts{type} eq 'b' || $cmdopts{type} eq 'd') {
- # Spec file
- $specfile = $_;
- } else {
- # Tarball build. Need to extract tarball to find spec file. Whee.
- $tarball = $_;
- }
+ } elsif ($cmdopts{type} eq 'b' || $cmdopts{type} eq 'd') {
+ # Spec file
+ $specfile = $_;
+ } else {
+ # Tarball build. Need to extract tarball to find spec file. Whee.
+ $tarball = $_;
+ }
}
}
$prevopt = $_;
@@ -482,13 +482,13 @@
# Basic algorithm:
# For each line
# if it's a member of an %if construct, branch and see which segment of the
-# spec file we need to parse and which one gets discarded, then
-# short-circuit back to the top of the loop.
+# spec file we need to parse and which one gets discarded, then
+# short-circuit back to the top of the loop.
# if it's a %section, bump the stage. Preparse addons to the %section line
-# (eg subpackage) and stuff them in suitable loop-global variables, then
-# short-circuit back to the top of the loop.
+# (eg subpackage) and stuff them in suitable loop-global variables, then
+# short-circuit back to the top of the loop.
# Otherwise, parse the line according to which section we're supposedly
-# parsing right now
+# parsing right now
LINE: while (<SPECFILE>) {
next if /^#/ && $stage eq 'preamble'; # Ignore comments...
@@ -501,13 +501,13 @@
# Extracted from the Maximum RPM online doc via:
# grep -h %[a-z] *|perl -e 'while (<>) { /\%([a-z0-9]+)\b/; print "$1|\n";
}'|sort -u
if (/^%[a-z]/ &&
- $_ !~
/^%(?:attr|build|changelog|check|clean|config|configure|defattr|define|description|
-
dir|doc|docdir|else|endif|files|ghost|if|ifarch|ifn|ifnarch|ifnos|ifnxxx|fos|ifxxx|
-
install|makeinstall|package|patch\d+|post|postun|pre|prep|preun|readme|setup|
- triggerin|triggerpostun|triggerun|verify|verifyscript)\b/x
- ) {
- my ($badtag) = (/^%([a-z]+)/i);
- die "Unknown tag \%$badtag at line $. of $specfile\n";
+ $_ !~
/^%(?:attr|build|changelog|check|clean|config|configure|defattr|define|description|
+
dir|doc|docdir|else|endif|files|ghost|if|ifarch|ifn|ifnarch|ifnos|ifnxxx|fos|ifxxx|
+
install|makeinstall|package|patch\d+|post|postun|pre|prep|preun|readme|setup|
+ triggerin|triggerpostun|triggerun|verify|verifyscript)\b/x
+ ) {
+ my ($badtag) = (/^%([a-z]+)/i);
+ die "Unknown tag \%$badtag at line $. of $specfile\n";
}
# preprocess %define's
@@ -528,14 +528,14 @@
# For Great w00tness! New and Improved multilayered logic handling.
- my @bits = split /\b/, $expr;
- $expr = '';
- foreach my $bit (@bits) {
- next if $bit eq '"';
- $bit =~ s/"//g;
- $expr .= qq("$bit") if $bit =~ /^\w+$/;
- $expr .= $bit if $bit !~ /^\w+$/;
- }
+ my @bits = split /\b/, $expr;
+ $expr = '';
+ foreach my $bit (@bits) {
+ next if $bit eq '"';
+ $bit =~ s/"//g;
+ $expr .= qq("$bit") if $bit =~ /^\w+$/;
+ $expr .= $bit if $bit !~ /^\w+$/;
+ }
# Done in this order so we don't cascade incorrectly. Yes, those
spaces ARE correct in the replacements!
$expr =~ s/==/ eq /g;
@@ -702,19 +702,19 @@
$prepscript .= "mkdir $tarballdir\ncd $tarballdir\n";
}
$prepscript .= "tar -".
- ( $pkgdata{main}{source} =~ /\.tar\.gz$/ ? "z" : "" ).
- ( $pkgdata{main}{source} =~ /\.tar\.bz2$/ ? "j" : "" ).
- ( /\s+-q\s+/ ? '' : 'vv' )."xf ".
- "$topdir/SOURCES/$pkgdata{main}{source}\n".
- qq(STATUS=\$?\nif [ \$STATUS -ne 0 ]; then\n exit
\$STATUS\nfi\n).
- "cd $topdir/BUILD/$tarballdir\n".
- qq([ `/usr/bin/id -u` = '0' ] && /bin/chown -Rhf root .\n).
- qq([ `/usr/bin/id -u` = '0' ] && /bin/chgrp -Rhf root .\n).
- qq(/bin/chmod -Rf a+rX,g-w,o-w .\n);
+ ( $pkgdata{main}{source} =~ /\.tar\.gz$/ ? "z" : "" ).
+ ( $pkgdata{main}{source} =~ /\.tar\.bz2$/ ? "j" : "" ).
+ ( /\s+-q\s+/ ? '' : 'vv' )."xf ".
+ "$topdir/SOURCES/$pkgdata{main}{source}\n".
+ qq(STATUS=\$?\nif [ \$STATUS -ne 0 ]; then\n exit
\$STATUS\nfi\n).
+ "cd $topdir/BUILD/$tarballdir\n".
+ qq([ `/usr/bin/id -u` = '0' ] && /bin/chown -Rhf root .\n).
+ qq([ `/usr/bin/id -u` = '0' ] && /bin/chgrp -Rhf root .\n).
+ qq(/bin/chmod -Rf a+rX,g-w,o-w .\n);
} elsif ( my ($patchnum,$patchopts) = (/^\%patch([^\s]+)(\s+.+)?$/) ) {
chomp $patchnum;
$prepscript .= qq(echo "Patch #$patchnum
($pkgdata{main}{"patch$patchnum"}):"\n).
- "patch ";
+ "patch ";
# If there are options passed, use'em.
# Otherwise, catch a bare %patch and ASS-U-ME it's '-p0'-able.
# Will break on options that don't provide -pnn, but what the hell.
@@ -768,7 +768,7 @@
next LINE if /^\%ghost/;
# Debian dpkg doesn't speak "%docdir". Meh.
next LINE if /^\%docdir/;
-# my $singleton = 0; # don't recall what this was for
+# my $singleton = 0; # don't recall what this was for
# create and initialize flags
my ($perms, $owner, $group, $conf, $filesline);
@@ -778,14 +778,14 @@
# strip and flag %attr constructs
if ($filesline =~ /\%attr\b/) {
- # Extract %attr...
- my ($args) =
(/(\%attr\s*\(\s*[\d-]+\s*,\s*["a-zA-Z0-9-]+\s*,\s*["a-zA-Z0-9-]+\s*\))/);
- $args =~ s/\s+//g;
- $args =~ s/"//g; # don't think quotes are ever necessary, but
they're *allowed*
- # ... and parse it ...
- ($perms,$owner,$group) = ($args =~
/\(([\d-]+),([a-zA-Z0-9-]+),([a-zA-Z0-9-]+)/);
- # ... and wipe it when we're done.
- $filesline =~
s/\%attr\s*\(\s*[\d-]+\s*,\s*["a-zA-Z0-9-]+\s*,\s*["a-zA-Z0-9-]+\s*\)//;
+ # Extract %attr...
+ my ($args) =
(/(\%attr\s*\(\s*[\d-]+\s*,\s*["a-zA-Z0-9-]+\s*,\s*["a-zA-Z0-9-]+\s*\))/);
+ $args =~ s/\s+//g;
+ $args =~ s/"//g; # don't think quotes are ever necessary, but
they're *allowed*
+ # ... and parse it ...
+ ($perms,$owner,$group) = ($args =~
/\(([\d-]+),([a-zA-Z0-9-]+),([a-zA-Z0-9-]+)/);
+ # ... and wipe it when we're done.
+ $filesline =~
s/\%attr\s*\(\s*[\d-]+\s*,\s*["a-zA-Z0-9-]+\s*,\s*["a-zA-Z0-9-]+\s*\)//;
}
# Conffiles. Note that Debian and RH have similar, but not
@@ -797,8 +797,8 @@
# hmm. not sure if such is **POSSIBLE** with Debian... maybe an addition to
%post?
if ($filesline =~ /\%config\b(?:\s*\(\s*noreplace\s*\)\s*)?/) {
$pkgdata{$subname}{conffiles} = 1; # Flag it for later
- $conf = 'y';
- $filesline =~ s/\%config\b(?:\s*\(\s*noreplace\s*\)\s*)?//;
+ $conf = 'y';
+ $filesline =~ s/\%config\b(?:\s*\(\s*noreplace\s*\)\s*)?//;
}
# %doc needs extra processing, because it can be a space-separated list,
and may
@@ -812,20 +812,20 @@
$filesline =~ s/\s*\%doc\s+//;
# this could probably go elsewhere.
- my $pkgname = $pkgdata{$subname}{name};
- $pkgname =~ tr/_/-/;
+ my $pkgname = $pkgdata{$subname}{name};
+ $pkgname =~ tr/_/-/;
- # have to extract the partial pathnames that %doc installs automagically
- foreach (split /\s+/, $filesline) {
- if (! (/^\%/ or m|^/|) ) {
- $doclist{$subname} .= " $_";
- my ($element) = m|([^/\s]+/?)$|;
- $filesline =~ s|$_|\%{_docdir}/$pkgname/$element|;
- }
- }
+ # have to extract the partial pathnames that %doc installs
automagically
+ foreach (split /\s+/, $filesline) {
+ if (! (/^\%/ or m|^/|) ) {
+ $doclist{$subname} .= " $_";
+ my ($element) = m|([^/\s]+/?)$|;
+ $filesline =~ s|$_|\%{_docdir}/$pkgname/$element|;
+ }
+ }
} # $filesline =~ /\%doc\b/
- $filesline =~ s/^\s*//; # Just In Case. For, uh, neatness.
+ $filesline =~ s/^\s*//; # Just In Case. For, uh, neatness.
# due to Debian's total lack of real permissions-processing in its actual
package
# handling component (dpkg-deb), this can't really be done "properly". We'll
have
@@ -873,7 +873,7 @@
$specglobals{buildroot} = $1;
} elsif (/^source0?:\s*(.+)/i) {
$pkgdata{main}{source} = $1;
- # .tar, .tar.gz, .tar.bz2, .tgz
+ # .tar, .tar.gz, .tar.bz2, .tgz
die "Unknown tarball format $1\n" if $1 !~
/\.(?:tar(?:\.(?:gz|bz2))?|tgz)$/;
} elsif (/^source([0-9]+):\s*(.+)/i) {
$pkgdata{sources}{$1} = $2;
@@ -900,19 +900,19 @@
$pkgdata{main}{conflicts} .= ", $1";
} elsif (/^recommends:\s*(.+)/i) {
$pkgdata{main}{recommends} .= ", $1";
- warn "Warning: Debian-specific 'Recommends:' outside \%if wrapper\n"
if $iflevel == 0;
+ warn "Warning: Debian-specific 'Recommends:' outside \%if wrapper\n"
if $iflevel == 0;
} elsif (/^suggests:\s*(.+)/i) {
$pkgdata{main}{suggests} .= ", $1";
- warn "Warning: Debian-specific 'Suggests:' outside \%if wrapper\n" if
$iflevel == 0;
+ warn "Warning: Debian-specific 'Suggests:' outside \%if wrapper\n" if
$iflevel == 0;
} elsif (/^enhances:\s*(.+)/i) {
$pkgdata{main}{enhances} .= ", $1";
- warn "Warning: Debian-specific 'Enahnces:' outside \%if wrapper\n" if
$iflevel == 0;
+ warn "Warning: Debian-specific 'Enahnces:' outside \%if wrapper\n" if
$iflevel == 0;
} elsif (/^replaces:\s*(.+)/i) {
$pkgdata{main}{replaces} .= ", $1";
- warn "Warning: Debian-specific 'Replaces:' outside \%if wrapper\n" if
$iflevel == 0;
+ warn "Warning: Debian-specific 'Replaces:' outside \%if wrapper\n" if
$iflevel == 0;
} elsif (/^autoreq(?:prov)?:\s*(.+)/i) {
- # we don't handle auto-provides (yet)
- $NoAutoReq = 1 if $1 =~ /(?:no|0)/i;
+ # we don't handle auto-provides (yet)
+ $NoAutoReq = 1 if $1 =~ /(?:no|0)/i;
}
next LINE;
} # preamble
@@ -942,7 +942,7 @@
# create script filename
my $prepscriptfile = "$tmpdir/deb-tmp.prep.".int(rand(99998)+1);
sysopen(PREPSCRIPT, $prepscriptfile, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW)
- or die $!;
+ or die $!;
print PREPSCRIPT $scriptletbase;
print PREPSCRIPT $prepscript;
close PREPSCRIPT;
@@ -950,7 +950,7 @@
# execute
print "Calling \%prep script $prepscriptfile...\n";
system("/bin/sh -e $prepscriptfile") == 0
- or die "Can't exec: $!\n";
+ or die "Can't exec: $!\n";
# and clean up
unlink $prepscriptfile;
@@ -966,7 +966,7 @@
# create script filename
my $buildscriptfile = "$tmpdir/deb-tmp.build.".int(rand(99998)+1);
sysopen(BUILDSCRIPT, $buildscriptfile, O_RDWR | O_CREAT | O_EXCL |
O_NOFOLLOW)
- or die $!;
+ or die $!;
print BUILDSCRIPT $scriptletbase;
print BUILDSCRIPT $buildscript;
close BUILDSCRIPT;
@@ -974,7 +974,7 @@
# execute
print "Calling \%build script $buildscriptfile...\n";
system("/bin/sh -e $buildscriptfile") == 0
- or die "Can't exec: $!\n";
+ or die "Can't exec: $!\n";
# and clean up
unlink $buildscriptfile;
@@ -1005,7 +1005,7 @@
# create script filename
my $installscriptfile = "$tmpdir/deb-tmp.inst.".int(rand(99998)+1);
sysopen(INSTSCRIPT, $installscriptfile, O_RDWR | O_CREAT | O_EXCL |
O_NOFOLLOW)
- or die $!;
+ or die $!;
print INSTSCRIPT $scriptletbase;
print INSTSCRIPT $installscript;
close INSTSCRIPT;
@@ -1013,7 +1013,7 @@
# execute
print "Calling \%install script $installscriptfile...\n";
system("/bin/sh -e $installscriptfile") == 0
- or die "Can't exec: $!\n";
+ or die "Can't exec: $!\n";
# and clean up
unlink $installscriptfile;
@@ -1028,23 +1028,23 @@
next if $mandir !~ /^man/;
opendir MANPAGES, "$specglobals{buildroot}/usr/share/man/$mandir";
my @pagelist = readdir MANPAGES;
- closedir MANPAGES; # Slightly safer to to this;
no accidental recursion. O_o
+ closedir MANPAGES; # Slightly safer to to this;
no accidental recursion. O_o
foreach my $manpage (@pagelist) {
$manpage = "$specglobals{buildroot}/usr/share/man/$mandir/$manpage";
if ( -f $manpage) {
- if ($manpage =~ /^(.+)\.(?:Z|gz|bz2)\n?$/) {
- my $newpage = $1;
- `gunzip $manpage` if $manpage =~ /\.(?:Z|gz)$/;
- `bunzip2 $manpage` if $manpage =~ /\.bz2$/;
- $manpage = $newpage;
- }
- `gzip -9 -n $manpage`;
+ if ($manpage =~ /^(.+)\.(?:Z|gz|bz2)\n?$/) {
+ my $newpage = $1;
+ `gunzip $manpage` if $manpage =~ /\.(?:Z|gz)$/;
+ `bunzip2 $manpage` if $manpage =~ /\.bz2$/;
+ $manpage = $newpage;
+ }
+ `gzip -9 -n $manpage`;
} elsif ( -l $manpage) {
- my $linkdest = readlink $manpage;
- $linkdest =~ s/\.(?:Z|gz|bz2)//;
- unlink $manpage;
- $manpage =~ s/\.(?:Z|gz|bz2)//;
- symlink "$linkdest.gz", "$manpage.gz" or print "DEBUG: wibble:
symlinking manpage failed: $!\n";
+ my $linkdest = readlink $manpage;
+ $linkdest =~ s/\.(?:Z|gz|bz2)//;
+ unlink $manpage;
+ $manpage =~ s/\.(?:Z|gz|bz2)//;
+ symlink "$linkdest.gz", "$manpage.gz" or print "DEBUG: wibble:
symlinking manpage failed: $!\n";
}
}
}
@@ -1086,26 +1086,26 @@
# Feh. Manpages don't **NEED** to be gzipped, but rpmbuild does, and so
shall we.
if ($pkgfile =~ m|/usr/share/man/man|) {
- # need to check to see if manpage is gzipped
- if (-e "$specglobals{buildroot}$pkgfile") {
- if ($pkgfile !~ m|\.gz$|) {
- qx { gzip $specglobals{buildroot}$pkgfile };
- $pkgfile .= ".gz";
- }
- } else {
- if ($pkgfile !~ m|\.gz$|) {
- $pkgfile .= ".gz";
- } else {
- $pkgfile =~ s/\.gz$//;
- qx { gzip $specglobals{buildroot}$pkgfile };
- $pkgfile .= ".gz";
- }
- }
+ # need to check to see if manpage is gzipped
+ if (-e "$specglobals{buildroot}$pkgfile") {
+ if ($pkgfile !~ m|\.gz$|) {
+ qx { gzip $specglobals{buildroot}$pkgfile };
+ $pkgfile .= ".gz";
+ }
+ } else {
+ if ($pkgfile !~ m|\.gz$|) {
+ $pkgfile .= ".gz";
+ } else {
+ $pkgfile =~ s/\.gz$//;
+ qx { gzip $specglobals{buildroot}$pkgfile };
+ $pkgfile .= ".gz";
+ }
+ }
}
- my ($fpath,$fname) = ($pkgfile =~ m|(.+?/?)?([^/]+/?)$|); # We
don't need $fname now, but we might.
+ my ($fpath,$fname) = ($pkgfile =~ m|(.+?/?)?([^/]+/?)$|); # We don't
need $fname now, but we might.
qx { mkdir -p $specglobals{buildroot}/$pkg$fpath }
- if $fpath && $fpath ne '';
+ if $fpath && $fpath ne '';
qx { mv $specglobals{buildroot}$pkgfile
$specglobals{buildroot}/$pkg$fpath };
}
@@ -1116,7 +1116,7 @@
# magic needed to properly version dependencies...
# only provided deps will really be included
- $pkgdata{$pkg}{requires} =~ s/^, //; # Still have to do this here.
+ $pkgdata{$pkg}{requires} =~ s/^, //; # Still have to do this here.
$pkgdata{$pkg}{requires} =~ s/\s+//g;
my @deps = split /,/, $pkgdata{$pkg}{requires};
my $tmp = '';
@@ -1125,13 +1125,13 @@
# May or may not be versioned.
# We do this first so the version rewriter can do its magic next.
if (my ($mod,$ver) = ($dep =~ /^perl\(([A-Za-z0-9\:\-]+)\)([><=]+.+)?/)
) {
- $mod =~ s/^perl\(//;
- $mod =~ s/\)$//;
- $mod =~ s/::/-/g;
- $mod =~ tr/A-Z/a-z/;
- $mod = "lib$mod-perl";
- $mod .= $ver if $ver;
- $dep = $mod;
+ $mod =~ s/^perl\(//;
+ $mod =~ s/\)$//;
+ $mod =~ s/::/-/g;
+ $mod =~ tr/A-Z/a-z/;
+ $mod = "lib$mod-perl";
+ $mod .= $ver if $ver;
+ $dep = $mod;
}
if (my ($name,$rel,$value) = ($dep =~
/^([a-zA-Z0-9._-]+)([><=]+)([a-zA-Z0-9._-]+)$/)) {
$tmp .= ", $name ($rel $value)";
@@ -1179,31 +1179,31 @@
# create script filename
my $debscriptfile = "$tmpdir/deb-tmp.pkg.".int(rand(99998)+1);
sysopen(DEBSCRIPT, $debscriptfile, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW)
- or die $!;
+ or die $!;
print DEBSCRIPT $scriptletbase;
print DEBSCRIPT "fakeroot dpkg-deb -b $specglobals{buildroot}/$pkg
$topdir/DEBS/$pkgdata{$pkg}{arch}/".
- "$pkgdata{$pkg}{name}_".
- (defined($pkgdata{main}{epoch}) ? "$pkgdata{main}{epoch}:" : '').
-
"$pkgdata{$pkg}{version}-$pkgdata{main}{release}_$pkgdata{$pkg}{arch}.deb\n";
+ "$pkgdata{$pkg}{name}_".
+ (defined($pkgdata{main}{epoch}) ? "$pkgdata{main}{epoch}:" : '').
+
"$pkgdata{$pkg}{version}-$pkgdata{main}{release}_$pkgdata{$pkg}{arch}.deb\n";
# %$&$%@#@@#%@@@ Debian and their horrible ugly package names. >:(
close DEBSCRIPT;
my $control = "Package: $pkgdata{$pkg}{name}\n".
- "Version: ".
- (defined($pkgdata{main}{epoch}) ? "$pkgdata{main}{epoch}:" : '').
- "$pkgdata{$pkg}{version}-$pkgdata{main}{release}\n".
- "Section: $pkgdata{$pkg}{group}\n".
- "Priority: optional\n".
- "Architecture: $pkgdata{$pkg}{arch}\n".
- "Maintainer: $pkgdata{main}{packager}\n".
- ( $pkgdata{$pkg}{requires} ne '' ? "Depends:
$pkgdata{$pkg}{requires}\n" : '' ).
- ( defined($pkgdata{$pkg}{provides}) ? "Provides:
$pkgdata{$pkg}{provides}\n" : '' ).
- ( defined($pkgdata{$pkg}{conflicts}) ? "Conflicts:
$pkgdata{$pkg}{conflicts}\n" : '' ).
- ( defined($pkgdata{$pkg}{recommends}) ? "Recommends:
$pkgdata{$pkg}{recommends}\n" : '' ).
- ( defined($pkgdata{$pkg}{suggests}) ? "Suggests:
$pkgdata{$pkg}{suggests}\n" : '' ).
- ( defined($pkgdata{$pkg}{enhances}) ? "Enhances:
$pkgdata{$pkg}{enhances}\n" : '' ).
- ( defined($pkgdata{$pkg}{replaces}) ? "Replaces:
$pkgdata{$pkg}{replaces}\n" : '' ).
- "Description: $pkgdata{$pkg}{summary}\n";
+ "Version: ".
+ (defined($pkgdata{main}{epoch}) ? "$pkgdata{main}{epoch}:" : '').
+ "$pkgdata{$pkg}{version}-$pkgdata{main}{release}\n".
+ "Section: $pkgdata{$pkg}{group}\n".
+ "Priority: optional\n".
+ "Architecture: $pkgdata{$pkg}{arch}\n".
+ "Maintainer: $pkgdata{main}{packager}\n".
+ ( $pkgdata{$pkg}{requires} ne '' ? "Depends:
$pkgdata{$pkg}{requires}\n" : '' ).
+ ( defined($pkgdata{$pkg}{provides}) ? "Provides:
$pkgdata{$pkg}{provides}\n" : '' ).
+ ( defined($pkgdata{$pkg}{conflicts}) ? "Conflicts:
$pkgdata{$pkg}{conflicts}\n" : '' ).
+ ( defined($pkgdata{$pkg}{recommends}) ? "Recommends:
$pkgdata{$pkg}{recommends}\n" : '' ).
+ ( defined($pkgdata{$pkg}{suggests}) ? "Suggests:
$pkgdata{$pkg}{suggests}\n" : '' ).
+ ( defined($pkgdata{$pkg}{enhances}) ? "Enhances:
$pkgdata{$pkg}{enhances}\n" : '' ).
+ ( defined($pkgdata{$pkg}{replaces}) ? "Replaces:
$pkgdata{$pkg}{replaces}\n" : '' ).
+ "Description: $pkgdata{$pkg}{summary}\n";
$control .= "$pkgdata{$pkg}{desc}\n";
open CONTROL, ">$specglobals{buildroot}/$pkg/DEBIAN/control";
@@ -1215,13 +1215,13 @@
if ($pkgdata{$pkg}{conffiles}) {
open CONFLIST, ">$specglobals{buildroot}/$pkg/DEBIAN/conffiles";
foreach my $conffile (@{$pkgdata{$pkg}{conflist}}) {
- $conffile = expandmacros($conffile, 'g');
- my @tmp = glob "$specglobals{buildroot}/$pkg/$conffile";
- foreach (@tmp) {
- s|$specglobals{buildroot}/$pkg/||g; # nrgl. gotta be a better way
to do this...
- s/\s+/\n/g; # Not gonna support spaces in filenames. Ewww.
- print CONFLIST "$_\n";
- }
+ $conffile = expandmacros($conffile, 'g');
+ my @tmp = glob "$specglobals{buildroot}/$pkg/$conffile";
+ foreach (@tmp) {
+ s|$specglobals{buildroot}/$pkg/||g; # nrgl. gotta be a better way
to do this...
+ s/\s+/\n/g; # Not gonna support spaces in filenames. Ewww.
+ print CONFLIST "$_\n";
+ }
}
close CONFLIST;
}
@@ -1263,13 +1263,13 @@
# execute
print "Calling package creation script $debscriptfile for
$pkgdata{$pkg}{name}...\n";
system("/bin/sh -e $debscriptfile") == 0
- or die "Can't exec: $!\n";
+ or die "Can't exec: $!\n";
$finalmessages .= "Wrote binary package ".
- "$pkgdata{$pkg}{name}_".
- (defined($pkgdata{main}{epoch}) ? "$pkgdata{main}{epoch}:" : '').
-
"$pkgdata{$pkg}{version}-$pkgdata{main}{release}_$pkgdata{$pkg}{arch}.deb".
- " in $topdir/DEBS/$pkgdata{$pkg}{arch}\n";
+ "$pkgdata{$pkg}{name}_".
+ (defined($pkgdata{main}{epoch}) ? "$pkgdata{main}{epoch}:" : '').
+
"$pkgdata{$pkg}{version}-$pkgdata{main}{release}_$pkgdata{$pkg}{arch}.deb".
+ " in $topdir/DEBS/$pkgdata{$pkg}{arch}\n";
# and clean up
unlink $debscriptfile;
@@ -1287,8 +1287,8 @@
# In case we were called with -bs.
$pkgdata{main}{name} =~ tr/_/-/;
my $pkgsrcname = "$pkgdata{main}{name}-".
- (defined($pkgdata{main}{epoch}) ? "$pkgdata{main}{epoch}:" : '').
- "$pkgdata{main}{version}-$pkgdata{main}{release}.sdeb";
+ (defined($pkgdata{main}{epoch}) ? "$pkgdata{main}{epoch}:" : '').
+ "$pkgdata{main}{version}-$pkgdata{main}{release}.sdeb";
my $paxcmd;
@@ -1341,7 +1341,7 @@
# create script filename
my $cleanscriptfile = "$tmpdir/deb-tmp.clean.".int(rand(99998)+1);
sysopen(CLEANSCRIPT, $cleanscriptfile, O_RDWR | O_CREAT | O_EXCL |
O_NOFOLLOW)
- or die $!;
+ or die $!;
print CLEANSCRIPT $scriptletbase;
print CLEANSCRIPT $cleanscript;
close CLEANSCRIPT;
@@ -1349,7 +1349,7 @@
# execute
print "Calling \%clean script $cleanscriptfile...\n";
system("/bin/sh -e $cleanscriptfile") == 0
- or die "Can't exec: $!\n";
+ or die "Can't exec: $!\n";
# and clean up
unlink $cleanscriptfile;
@@ -1361,18 +1361,18 @@
# Spits out a rude warning and returns a true-false error if any
# requirements are not met.
sub checkbuildreq {
- return 1 if $buildreq eq ''; # No use doing extra work.
+ return 1 if $buildreq eq ''; # No use doing extra work.
if ( ! -e "/usr/bin/dpkg-query" ) {
print "**WARNING** dpkg-query not found. Can't check build-deps.\n".
- " Required for sucessful build:\n".$buildreq."\n".
- " Continuing anyway.\n";
+ " Required for sucessful build:\n".$buildreq."\n".
+ " Continuing anyway.\n";
return 1;
}
my $reqflag = 1; # unset iff a buildreq is missing
- $buildreq =~ s/^, //; # Strip the leading comma and space
+ $buildreq =~ s/^, //; # Strip the leading comma and space
my @reqlist = split /,\s+/, $buildreq;
foreach my $req (@reqlist) {
@@ -1398,8 +1398,8 @@
} else {
my ($resp) = qx { dpkg --compare-versions $reqver '$rel' $ver && echo
"ok" };
if ($resp !~ /^ok/) {
- $reqflag = 0;
- print " * Buildreq $pkg is installed, but wrong version ($reqver):
Need $ver\n"
+ $reqflag = 0;
+ print " * Buildreq $pkg is installed, but wrong version ($reqver):
Need $ver\n"
}
} # end not installed/installed check
} # end req loop
@@ -1445,12 +1445,12 @@
foreach (@reqlist) {
next if /^$pkgtree/;
next if /not a dynamic executable/;
- next if m|/lib(?:64)?/ld-linux|; # Hack! Hack! PTHBTT! (libc suxx0rz)
- next if /linux-gate.so/; # Kernel hackery for teh
W1n!!1!1eleventy-one!1 (Don't ask. Feh.)
+ next if m|/lib(?:64)?/ld-linux|; # Hack! Hack! PTHBTT! (libc suxx0rz)
+ next if /linux-gate.so/; # Kernel hackery for teh
W1n!!1!1eleventy-one!1 (Don't ask. Feh.)
my ($req) = (m|=\>\s+([a-z0-9._/-]+)|); # dig out the actual library
(so)name.
- # And feh, we need the *path*, since I've discovered a new edge case
where
- # the same libnnn.1.2.3 *file*name is found across *several* lib dirs.
>:(
+ # And feh, we need the *path*, since I've discovered a new edge case
where
+ # the same libnnn.1.2.3 *file*name is found across *several* lib dirs.
>:(
# Ignore libs provided by this package. Note that we don't match
# on word-boundary at the *end* of the lib we're looking for, as the
@@ -1511,22 +1511,22 @@
if ($section =~ /c/) {
# %configure macro
# Don't know what it's for, don't have a useful default replacement
-# --program-prefix=%{_program_prefix} \
+# --program-prefix=%{_program_prefix} \
$macrostring =~ s'%configure'./configure --host=$DEB_HOST_GNU_TYPE \
- --build=$DEB_BUILD_GNU_TYPE \
- --prefix=%{_prefix} \
- --exec-prefix=%{_exec_prefix} \
- --bindir=%{_bindir} \
- --sbindir=%{_sbindir} \
- --sysconfdir=%{_sysconfdir} \
- --datadir=%{_datadir} \
- --includedir=%{_includedir} \
- --libdir=%{_libdir} \
- --libexecdir=%{_libexecdir} \
- --localstatedir=%{_localstatedir} \
- --sharedstatedir=%{_sharedstatedir} \
- --mandir=%{_mandir} \
- --infodir=%{_infodir} ';
+ --build=$DEB_BUILD_GNU_TYPE \
+ --prefix=%{_prefix} \
+ --exec-prefix=%{_exec_prefix} \
+ --bindir=%{_bindir} \
+ --sbindir=%{_sbindir} \
+ --sysconfdir=%{_sysconfdir} \
+ --datadir=%{_datadir} \
+ --includedir=%{_includedir} \
+ --libdir=%{_libdir} \
+ --libexecdir=%{_libexecdir} \
+ --localstatedir=%{_localstatedir} \
+ --sharedstatedir=%{_sharedstatedir} \
+ --mandir=%{_mandir} \
+ --infodir=%{_infodir} ';
} # done %configure
if ($section =~ /m/) {
@@ -1558,20 +1558,20 @@
# Note that these are processed in reverse order to get the substitution
order right
if ($section =~ /b/) {
# $macrostring =~ s'%{fhs}'host=$DEB_HOST_GNU_TYPE \
-# build=$DEB_BUILD_GNU_TYPE \
+# build=$DEB_BUILD_GNU_TYPE \
$macrostring =~ s'%{fhs}'prefix=%{_prefix} \
- exec-prefix=%{_exec_prefix} \
- bindir=%{_bindir} \
- sbindir=%{_sbindir} \
- sysconfdir=%{_sysconfdir} \
- datadir=%{_datadir} \
- includedir=%{_includedir} \
- libdir=%{_libdir} \
- libexecdir=%{_libexecdir} \
- localstatedir=%{_localstatedir} \
- sharedstatedir=%{_sharedstatedir} \
- mandir=%{_mandir} \
- infodir=%{_infodir} \
+ exec-prefix=%{_exec_prefix} \
+ bindir=%{_bindir} \
+ sbindir=%{_sbindir} \
+ sysconfdir=%{_sysconfdir} \
+ datadir=%{_datadir} \
+ includedir=%{_includedir} \
+ libdir=%{_libdir} \
+ libexecdir=%{_libexecdir} \
+ localstatedir=%{_localstatedir} \
+ sharedstatedir=%{_sharedstatedir} \
+ mandir=%{_mandir} \
+ infodir=%{_infodir} \
';
# Note that the above regex terminates with the extra space
@@ -1580,22 +1580,22 @@
# over the "default" ones.
# Now we cascade the macros introduced above. >_<
- # Wot
ot to go theah:
- $macrostring =~ s|%{_mandir}|%{_datadir}/man|g;
#/usr/share/man
- $macrostring =~ s|%{_infodir}|%{_datadir}/info|g;
#/usr/share/info
- $macrostring =~ s|%{_oldincludedir}|/usr/include|g;
#/usr/include
- $macrostring =~ s|%{_includedir}|%{_prefix}/include|g; #/usr/include
- $macrostring =~ s|%{_libdir}|%{_exec_prefix}/%{_lib}|g; #/usr/lib
- $macrostring =~ s|%{_lib}|lib|g; #?
- $macrostring =~ s|%{_localstatedir}|/var|g; #/var
- $macrostring =~ s|%{_sharedstatedir}|%{_prefix}/com|g; #/usr/com WTF?
- $macrostring =~ s|%{_sysconfdir}|/etc|g; #/etc
- $macrostring =~ s|%{_datadir}|%{_prefix}/share|g; #/usr/share
- $macrostring =~ s|%{_libexecdir}|%{_exec_prefix}/libexec|g;
#/usr/libexec
- $macrostring =~ s|%{_sbindir}|%{_exec_prefix}/sbin|g; #/usr/sbin
- $macrostring =~ s|%{_bindir}|%{_exec_prefix}/bin|g;
#/usr/bin
- $macrostring =~ s|%{_exec_prefix}|%{_prefix}|g; #/usr
- $macrostring =~ s|%{_prefix}|/usr|g; #/usr
+ # Wot
ot to go theah:
+ $macrostring =~ s|%{_mandir}|%{_datadir}/man|g;
#/usr/share/man
+ $macrostring =~ s|%{_infodir}|%{_datadir}/info|g;
#/usr/share/info
+ $macrostring =~ s|%{_oldincludedir}|/usr/include|g; #/usr/include
+ $macrostring =~ s|%{_includedir}|%{_prefix}/include|g; #/usr/include
+ $macrostring =~ s|%{_libdir}|%{_exec_prefix}/%{_lib}|g; #/usr/lib
+ $macrostring =~ s|%{_lib}|lib|g; #?
+ $macrostring =~ s|%{_localstatedir}|/var|g; #/var
+ $macrostring =~ s|%{_sharedstatedir}|%{_prefix}/com|g; #/usr/com WTF?
+ $macrostring =~ s|%{_sysconfdir}|/etc|g; #/etc
+ $macrostring =~ s|%{_datadir}|%{_prefix}/share|g; #/usr/share
+ $macrostring =~ s|%{_libexecdir}|%{_exec_prefix}/libexec|g; #/usr/libexec
+ $macrostring =~ s|%{_sbindir}|%{_exec_prefix}/sbin|g; #/usr/sbin
+ $macrostring =~ s|%{_bindir}|%{_exec_prefix}/bin|g; #/usr/bin
+ $macrostring =~ s|%{_exec_prefix}|%{_prefix}|g; #/usr
+ $macrostring =~ s|%{_prefix}|/usr|g; #/usr
} # done with config section
# Package data
@@ -1639,14 +1639,14 @@
# Oy vey this gets silly for the perl bits. Executing a shell to
# call Perl to get the vendorlib/sitelib/whatever "core" globals.
# This can do more, but... eww.
- $shellstr = qx { /bin/sh -c '$shellstr' }; # Yay! ' characters
apparently get properly exscapededed.
+ $shellstr = qx { /bin/sh -c '$shellstr' }; # Yay! ' characters
apparently get properly exscapededed.
$macrostring =~ s/\%\(.+\)/$shellstr/;
}
# support for **some** %if constructs. Note that this breaks somewhat if
# there's no value specified... but so does rpm.
- my $tmpcount = 0; # runaway shutdown. Not really sure how else to avoid
getting stuck.
+ my $tmpcount = 0; # runaway shutdown. Not really sure how else to avoid
getting stuck.
while ($macrostring =~
m/\%\{([?!]+)([a-z0-9_.-]+)(?:\:([a-z0-9_.\/\-\\]+)?)?\}/g) { #Whew....
my $qex = $1;
my $macro = $2;
@@ -1654,9 +1654,9 @@
my $neg = '1' if $qex =~ /\!/;
if ($specglobals{$macro}) {
- $value = '' if $neg;
+ $value = '' if $neg;
} else {
- $value = '' if !$neg;
+ $value = '' if !$neg;
}
$macrostring =~
s/\%\{[?!]+[a-z0-9_.-]+(?:\:([a-z0-9_.\/\-\\]+)?)?\}/$value/;
@@ -1678,7 +1678,7 @@
# hrm. This needs thinking.
#die "A horrible death! \%{$key}, '$macrostring'\n" if !$specglobals{$key};
$macrostring =~ s|%{$key}|$specglobals{$key}|g;
- # wanna limit this to "... if $specglobals{$key}", but need
more magic
+ # wanna limit this to "... if $specglobals{$key}", but need
more magic
}
# system programs. RPM uses a global config file for these; we'll just
Modified: trunk/tools/packaging/debian-init.d-pisacd
==============================================================================
--- trunk/tools/packaging/debian-init.d-pisacd Fri Nov 20 15:19:06 2009
(r1737)
+++ trunk/tools/packaging/debian-init.d-pisacd Fri Nov 20 16:30:16 2009
(r1738)
@@ -18,41 +18,40 @@
stop_pisacd() {
# Ensure that we don't try to kill init.d script itself
#start-stop-daemon --stop --quiet --oknodo --retry 30
- if [ $PID ]
- then
- kill $1 $PID
+ if [ $PID ]; then
+ kill $1 $PID
fi
}
case "$1" in
- start)
+ start)
echo -n "Starting pisacd"
- start-stop-daemon --start --quiet --background --exec /usr/sbin/pisacd
-- $PISACD_OPTS
+ start-stop-daemon --start --quiet --background --exec /usr/sbin/pisacd
-- $PISACD_OPTS
echo "."
- ;;
- stop)
+ ;;
+ stop)
echo -n "Stopping pisacd"
- stop_pisacd
+ stop_pisacd
echo "."
- ;;
+ ;;
- reload|force-reload)
+ reload|force-reload)
echo -n "Reloading pisacd"
- start-stop-daemon --stop --signal 1 --quiet --oknodo --exec
/usr/sbin/pisacd -name pisacd
- echo "."
- ;;
+ start-stop-daemon --stop --signal 1 --quiet --oknodo --exec
/usr/sbin/pisacd -name pisacd
+ echo "."
+ ;;
- restart)
+ restart)
echo -n "Restarting pisacd"
# Daemon waits N seconds for closing of connections - just kill it
- stop_pisacd -KILL
- start-stop-daemon --start --quiet --exec /usr/sbin/pisacd --
$PISACD_OPTS
- echo "."
- ;;
+ stop_pisacd -KILL
+ start-stop-daemon --start --quiet --exec /usr/sbin/pisacd --
$PISACD_OPTS
+ echo "."
+ ;;
- *)
- echo "Usage: /etc/init.d/pisacd
{start|stop|reload|force-reload|restart}"
- exit 1
+ *)
+ echo "Usage: /etc/init.d/pisacd
{start|stop|reload|force-reload|restart}"
+ exit 1
esac
exit 0
Modified: trunk/tools/packaging/debian-init.d-pisasd
==============================================================================
--- trunk/tools/packaging/debian-init.d-pisasd Fri Nov 20 15:19:06 2009
(r1737)
+++ trunk/tools/packaging/debian-init.d-pisasd Fri Nov 20 16:30:16 2009
(r1738)
@@ -18,41 +18,40 @@
stop_pisasd() {
# Ensure that we don't try to kill init.d script itself
#start-stop-daemon --stop --quiet --oknodo --retry 30
- if [ $PID ]
- then
- kill $1 $PID
+ if [ $PID ]; then
+ kill $1 $PID
fi
}
case "$1" in
- start)
+ start)
echo -n "Starting pisasd"
- start-stop-daemon --start --quiet --background --exec /usr/sbin/pisasd
-- $PISASD_OPTS
+ start-stop-daemon --start --quiet --background --exec /usr/sbin/pisasd
-- $PISASD_OPTS
echo "."
- ;;
- stop)
+ ;;
+ stop)
echo -n "Stopping pisasd"
- stop_pisasd
+ stop_pisasd
echo "."
- ;;
+ ;;
- reload|force-reload)
+ reload|force-reload)
echo -n "Reloading pisasd"
- start-stop-daemon --stop --signal 1 --quiet --oknodo --exec
/usr/sbin/pisasd -name pisasd
- echo "."
- ;;
+ start-stop-daemon --stop --signal 1 --quiet --oknodo --exec
/usr/sbin/pisasd -name pisasd
+ echo "."
+ ;;
- restart)
+ restart)
echo -n "Restarting pisasd"
# Daemon waits N seconds for closing of connections - just kill it
- stop_pisasd -KILL
- start-stop-daemon --start --quiet --exec /usr/sbin/pisasd --
$PISASD_OPTS
- echo "."
- ;;
+ stop_pisasd -KILL
+ start-stop-daemon --start --quiet --exec /usr/sbin/pisasd --
$PISASD_OPTS
+ echo "."
+ ;;
- *)
- echo "Usage: /etc/init.d/pisasd
{start|stop|reload|force-reload|restart}"
- exit 1
+ *)
+ echo "Usage: /etc/init.d/pisasd
{start|stop|reload|force-reload|restart}"
+ exit 1
esac
exit 0
Modified: trunk/tools/packaging/pisa-rpm.spec
==============================================================================
--- trunk/tools/packaging/pisa-rpm.spec Fri Nov 20 15:19:06 2009 (r1737)
+++ trunk/tools/packaging/pisa-rpm.spec Fri Nov 20 16:30:16 2009 (r1738)
@@ -67,43 +67,39 @@
/sbin/ldconfig
%post mobile-guest
-if [ "$1" = "2" ]
-then
- # upgrade
- /sbin/service pisacd restart
+if [ "$1" = "2" ]; then
+ # upgrade
+ /sbin/service pisacd restart
else
- # first install
- /sbin/chkconfig --add pisacd
- /sbin/chkconfig --level 2 pisacd on
- /sbin/service pisacd start
+ # first install
+ /sbin/chkconfig --add pisacd
+ /sbin/chkconfig --level 2 pisacd on
+ /sbin/service pisacd start
fi
%post trust-point
-if [ "$1" = "2" ]
-then
- # upgrade
- /sbin/service pisasd restart
+if [ "$1" = "2" ]; then
+ # upgrade
+ /sbin/service pisasd restart
else
- # first install
- /sbin/chkconfig --add pisasd
- /sbin/chkconfig --level 2 pisasd on
- /sbin/service pisasd start
+ # first install
+ /sbin/chkconfig --add pisasd
+ /sbin/chkconfig --level 2 pisasd on
+ /sbin/service pisasd start
fi
%preun mobile-guest
-if [ "$1" = "0" ]
-then
- # remove package completely
- /sbin/service pisacd stop
- /sbin/chkconfig --del pisacd
+if [ "$1" = "0" ]; then
+ # remove package completely
+ /sbin/service pisacd stop
+ /sbin/chkconfig --del pisacd
fi
%preun trust-point
-if [ "$1" = "0" ]
-then
- # remove package completely
- /sbin/service pisasd stop
- /sbin/chkconfig --del pisasd
+if [ "$1" = "0" ]; then
+ # remove package completely
+ /sbin/service pisasd stop
+ /sbin/chkconfig --del pisasd
fi
Modified: trunk/tools/packaging/rh-init.d-pisacd
==============================================================================
--- trunk/tools/packaging/rh-init.d-pisacd Fri Nov 20 15:19:06 2009
(r1737)
+++ trunk/tools/packaging/rh-init.d-pisacd Fri Nov 20 16:30:16 2009
(r1738)
@@ -24,39 +24,39 @@
start()
{
- echo -n $"Starting $BASENAME:"
- $DAEMON $OPTIONS && success || failure
- RETVAL=$?
- [ "$RETVAL" = 0 ] && touch $LOCK_FILE
- echo
+ echo -n $"Starting $BASENAME:"
+ $DAEMON $OPTIONS && success || failure
+ RETVAL=$?
+ [ "$RETVAL" = 0 ] && touch $LOCK_FILE
+ echo
}
stop()
{
- echo -n $"Stopping $BASENAME:"
- killproc $DAEMON
- RETVAL=$?
- [ "$RETVAL" = 0 ] && rm -f $LOCK_FILE
- echo
+ echo -n $"Stopping $BASENAME:"
+ killproc $DAEMON
+ RETVAL=$?
+ [ "$RETVAL" = 0 ] && rm -f $LOCK_FILE
+ echo
}
case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- restart)
- stop
- start
- ;;
- status)
- status $DAEMON
- RETVAL=$?
- ;;
- *)
- echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
- RETVAL=1
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ restart)
+ stop
+ start
+ ;;
+ status)
+ status $DAEMON
+ RETVAL=$?
+ ;;
+ *)
+ echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
+ RETVAL=1
esac
exit $RETVAL
Modified: trunk/tools/packaging/rh-init.d-pisasd
==============================================================================
--- trunk/tools/packaging/rh-init.d-pisasd Fri Nov 20 15:19:06 2009
(r1737)
+++ trunk/tools/packaging/rh-init.d-pisasd Fri Nov 20 16:30:16 2009
(r1738)
@@ -24,39 +24,39 @@
start()
{
- echo -n $"Starting $BASENAME:"
- $DAEMON $OPTIONS && success || failure
- RETVAL=$?
- [ "$RETVAL" = 0 ] && touch $LOCK_FILE
- echo
+ echo -n $"Starting $BASENAME:"
+ $DAEMON $OPTIONS && success || failure
+ RETVAL=$?
+ [ "$RETVAL" = 0 ] && touch $LOCK_FILE
+ echo
}
stop()
{
- echo -n $"Stopping $BASENAME:"
- killproc $DAEMON
- RETVAL=$?
- [ "$RETVAL" = 0 ] && rm -f $LOCK_FILE
- echo
+ echo -n $"Stopping $BASENAME:"
+ killproc $DAEMON
+ RETVAL=$?
+ [ "$RETVAL" = 0 ] && rm -f $LOCK_FILE
+ echo
}
case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- restart)
- stop
- start
- ;;
- status)
- status $DAEMON
- RETVAL=$?
- ;;
- *)
- echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
- RETVAL=1
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ restart)
+ stop
+ start
+ ;;
+ status)
+ status $DAEMON
+ RETVAL=$?
+ ;;
+ *)
+ echo $"Usage: $0 {start|stop|restart|reload|condrestart|status}"
+ RETVAL=1
esac
exit $RETVAL
Modified: trunk/tools/pisa_scripts.conf
==============================================================================
--- trunk/tools/pisa_scripts.conf Fri Nov 20 15:19:06 2009 (r1737)
+++ trunk/tools/pisa_scripts.conf Fri Nov 20 16:30:16 2009 (r1738)
@@ -4,7 +4,7 @@
WIFI_IF="wlan0"
BASE_DIR=$HOME"/pisa_testbed/"
-# IP settings
+# IP settings
IP="192.168.8.123"
NETMASK="255.255.255.0"
AP_IP="192.168.8.1"
Modified: trunk/tools/subversion/mailer.py.diff
==============================================================================
--- trunk/tools/subversion/mailer.py.diff Fri Nov 20 15:19:06 2009
(r1737)
+++ trunk/tools/subversion/mailer.py.diff Fri Nov 20 16:30:16 2009
(r1738)
@@ -1,5 +1,5 @@
---- /usr/share/subversion/hook-scripts/mailer/mailer.py 2009-08-06
19:39:36.000000000 +0200
-+++ mailer.py 2009-10-14 01:29:16.000000000 +0200
+--- /usr/share/subversion/hook-scripts/mailer/mailer.py 2009-08-06
19:39:36.000000000 +0200
++++ mailer.py 2009-10-14 01:29:16.000000000 +0200
@@ -366,14 +366,15 @@
# figure out the changed directories
dirs = { }
Modified: trunk/tools/subversion/post-commit
==============================================================================
--- trunk/tools/subversion/post-commit Fri Nov 20 15:19:06 2009 (r1737)
+++ trunk/tools/subversion/post-commit Fri Nov 20 16:30:16 2009 (r1738)
@@ -4,7 +4,7 @@
#
# The post-commit hook is invoked after a commit. Subversion runs
# this hook by invoking a program (script, executable, binary, etc.)
-# named 'post-commit' (for which this file is a template) with the
+# named 'post-commit' (for which this file is a template) with the
# following ordered arguments:
#
# [1] REPOS-PATH (the path to this repository)
Modified: trunk/tools/subversion/post-revprop-change
==============================================================================
--- trunk/tools/subversion/post-revprop-change Fri Nov 20 15:19:06 2009
(r1737)
+++ trunk/tools/subversion/post-revprop-change Fri Nov 20 16:30:16 2009
(r1738)
@@ -32,14 +32,14 @@
# On a Windows system, you should name the hook program
# 'post-revprop-change.bat' or 'post-revprop-change.exe',
# but the basic idea is the same.
-#
+#
# The hook program typically does not inherit the environment of
# its parent process. For example, a common problem is for the
# PATH environment variable to not be set to its usual value, so
# that subprograms fail to launch unless invoked via absolute path.
# If you're having unexpected problems with a hook program, the
# culprit may be unusual (or missing) environment variables.
-#
+#
# Here is an example hook script, for a Unix /bin/sh interpreter.
# For more examples and pre-written hooks, see those in
# the Subversion repository at
Modified: trunk/tools/subversion/pre-commit
==============================================================================
--- trunk/tools/subversion/pre-commit Fri Nov 20 15:19:06 2009 (r1737)
+++ trunk/tools/subversion/pre-commit Fri Nov 20 16:30:16 2009 (r1738)
@@ -46,7 +46,7 @@
# that subprograms fail to launch unless invoked via absolute path.
# If you're having unexpected problems with a hook program, the
# culprit may be unusual (or missing) environment variables.
-#
+#
# Here is an example hook script, for a Unix /bin/sh interpreter.
# For more examples and pre-written hooks, see those in
# the Subversion repository at
Modified: trunk/tools/trigger-hipupdate.sh
==============================================================================
--- trunk/tools/trigger-hipupdate.sh Fri Nov 20 15:19:06 2009 (r1737)
+++ trunk/tools/trigger-hipupdate.sh Fri Nov 20 16:30:16 2009 (r1738)
@@ -1,18 +1,16 @@
#!/bin/sh
# read config file
-if [ ! -e "pisa_scripts.conf" ]
-then
- echo "ERROR: "$PWD"/pisa_scripts.conf not found!"
- exit 1
+if [ ! -e "pisa_scripts.conf" ]; then
+ echo "ERROR: "$PWD"/pisa_scripts.conf not found!"
+ exit 1
fi
. pisa_scripts.conf
-# outputs the geo-id, if used in combination with pisabeacon
-if [ $# -eq 1 ]
-then
- echo "new geo-id:" $1
+# outputs the geo-id, if used in combination with pisabeacon
+if [ $# -eq 1 ]; then
+ echo "new geo-id:" $1
fi
# issue manual hip update
Modified: trunk/tools/tunnel/screamer.rb
==============================================================================
--- trunk/tools/tunnel/screamer.rb Fri Nov 20 15:19:06 2009 (r1737)
+++ trunk/tools/tunnel/screamer.rb Fri Nov 20 16:30:16 2009 (r1738)
@@ -2,10 +2,10 @@
require 'socket'
if (ARGV.size < 2) or (ARGV.size > 3) then
- puts "Error: usage screamer.rb <address> <port> [<sleep>]"
- puts "sleep in seconds or fractions of seconds"
- puts "Example: ./screamer.rb hip1 5001 0.001"
- exit 1
+ puts "Error: usage screamer.rb <address> <port> [<sleep>]"
+ puts "sleep in seconds or fractions of seconds"
+ puts "Example: ./screamer.rb hip1 5001 0.001"
+ exit 1
end
HOST=ARGV[0]
@@ -15,14 +15,14 @@
s=UDPSocket::new Socket::AF_INET6
while true
- sleep(SLEEP)
- begin
- s.send("hello\n",0,HOST,PORT)
- rescue Errno::ENETUNREACH
- sleep(0.5)
- next
- rescue Errno::EINVAL
- sleep(0.5)
- next
- end
+ sleep(SLEEP)
+ begin
+ s.send("hello\n",0,HOST,PORT)
+ rescue Errno::ENETUNREACH
+ sleep(0.5)
+ next
+ rescue Errno::EINVAL
+ sleep(0.5)
+ next
+ end
end
Modified: trunk/tools/writeff.pl
==============================================================================
--- trunk/tools/writeff.pl Fri Nov 20 15:19:06 2009 (r1737)
+++ trunk/tools/writeff.pl Fri Nov 20 16:30:16 2009 (r1738)
@@ -22,7 +22,7 @@
open FILE, "> $fname" or die "Cannot open $fname : $!";
for ($i = 0; $i < $fsize; $i++) {
- print FILE $chr;
+ print FILE $chr;
}
close FILE;
Other related posts:
