[hipl-commit] [release-1.0.5] Rev 3797: Syncronized to trunk revisions 3800..3811
- From: Miika Komu <miika@xxxxxx>
- To: hipl-commit@xxxxxxxxxxxxx
- Date: Fri, 19 Mar 2010 11:20:20 +0200
Committer: Miika Komu <miika@xxxxxx>
Date: 19/03/2010 at 11:20:20
Revision: 3797
Revision-id: miika@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: release-1.0.5
Log:
Syncronized to trunk revisions 3800..3811
Modified:
D hipd/accessor.c.doxyme
M Makefile.am
M check_header_verbosity.sh*
M hipd/accessor.c
M test/handovers.sh*
M test/hipsetup.old*
M test/iperf_handovers.sh*
M test/maintainer/fix-archive-perms*
M test/maintainer/sync-all*
M test/maintainer/tla-find-revision-locks*
M test/packaging/debian-init.d-dnsproxy*
M test/packaging/debian-init.d-hipd*
M test/packaging/debian-init.d-hipfw*
M test/packaging/fedora-init.d-bamboo_v4*
M test/packaging/fedora-init.d-bamboo_v6*
M test/packaging/rh-init.d-dnsproxy*
M test/packaging/rh-init.d-hipd*
M test/packaging/rh-init.d-hipfw*
M test/packaging/ubuntu-init.d-bamboo_v4*
M test/packaging/ubuntu-init.d-bamboo_v6*
M test/performance/clock_test.awk*
M test/performance/genstats.awk*
M test/performance/parser.awk*
M test/performance/perf_measure.sh
M test/performance/stats.pl*
M test/performance/switch-ip*
M test/performance/visualize-daemon.sh*
M test/pfkeysettest*
M test/test-run-daemon*
M test/tla-hook*
M tools/hipl_autobuild
M tools/hosts.py*
M tools/nsupdate.pl*
=== modified file 'Makefile.am'
--- Makefile.am 2010-03-03 13:16:18 +0000
+++ Makefile.am 2010-03-19 09:20:44 +0000
@@ -5,7 +5,9 @@
# XX FIX: use dist_doc_DATA for all documentation (if you change this,
# make sure the check the "make bin" still works)
#
-EXTRA_DIST = doc hipext hipsock jip patches test/packaging test/configs
+EXTRA_DIST = debian doc hipext hipfwmi patches test/packaging test/configs
+EXTRA_DIST += Android.mk check_header_verbosity.sh tcp verbose-headers.txt
+EXTRA_DIST += hipsock jip
EXTRA_DIST += autogen.sh i3-cfg-PL.xml release.version
EXTRA_DIST += $(wildcard agent/*.h)
EXTRA_DIST += $(wildcard i3/*/*.h)
=== modified file 'check_header_verbosity.sh' (properties changed: -x to +x)
=== modified file 'hipd/accessor.c'
--- hipd/accessor.c 2010-03-03 13:16:18 +0000
+++ hipd/accessor.c 2010-03-19 09:20:44 +0000
@@ -1,13 +1,12 @@
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+/**
+ * @file
+ *
+ * Distributed under <a href="http://www.gnu.org/licenses/gpl2.txt";>GNU/GPL</a>
+ *
+ * @brief An assortment of access for functions for hipd
+ *
+ * @author Miika Komu <miika@xxxxxx>
+ * @todo move the functions elsewhere and delete this file?
*/
/* required for s6_addr32 */
@@ -79,7 +78,12 @@
#ifdef CONFIG_HIP_OPPORTUNISTIC
/**
- * No description.
+ * Set opportunistic mode
+ *
+ * @param msg A message containing a HIP_PARAM_UINT parameter.
+ * Zero means turning off, one means "normal" (hipconf run opp)
+ * and two means advanced (system-based opportunistic mode).
+ * @return zero on success and negative on error
*/
int hip_set_opportunistic_mode(struct hip_common *msg)
{
@@ -115,7 +119,11 @@
}
/**
- * No description.
+ * Query opportunistic mode status
+ *
+ * @param msg an output parameter into which the function writes
+ * the status of the opportunistic mode
+ * @return zero on success or negative on error
*/
int hip_query_opportunistic_mode(struct hip_common *msg)
{
@@ -138,7 +146,11 @@
}
/**
- * No description.
+ * Query if a pseudo HIT is stored in the host association
+ * data base.
+ *
+ * @param msg a message containing a HIP_PARAM_PSEUDO_HIT parameter
+ * @return zero on success or negative on error
*/
int hip_query_ip_hit_mapping(struct hip_common *msg)
{
@@ -176,11 +188,21 @@
#endif // CONFIG_HIP_OPPORTUNISTIC
+/**
+ * Query status of client-side HIP proxy
+ *
+ * @return one if the proxy mode is on or zero otherwise
+ */
int hip_get_hip_proxy_status(void)
{
return hipproxy;
}
+/**
+ * Set the client-side proxy on
+ *
+ * @return zero on success or negative on error
+ */
int hip_set_hip_proxy_on(void)
{
int err = 0;
@@ -189,6 +211,11 @@
return err;
}
+/**
+ * Set the client-side proxy off
+ *
+ * @return zero on success or negative on error
+ */
int hip_set_hip_proxy_off(void)
{
int err = 0;
@@ -197,31 +224,61 @@
return err;
}
+/**
+ * Query status of sava client mode
+ *
+ * @return one if the sava client mode is on or zero otherwise
+ */
int hip_get_sava_client_status(void)
{
return hipsava_client;
}
+/**
+ * Query status of sava server mode
+ *
+ * @return one if the sava server mode is on or zero otherwise
+ */
int hip_get_sava_server_status(void)
{
return hipsava_server;
}
+/**
+ * Set the client-side sava mode on
+ *
+ * @return zero on success or negative on error
+ */
void hip_set_sava_client_on(void)
{
hipsava_client = 1;
}
+/**
+ * Set the server-side sava mode on
+ *
+ * @return zero on success or negative on error
+ */
void hip_set_sava_server_on(void)
{
hipsava_server = 1;
}
+/**
+ * Set the client-side sava mode off
+ *
+ * @return zero on success or negative on error
+ */
void hip_set_sava_client_off(void)
{
hipsava_client = 0;
}
+/**
+ * Set the server-side sava mode off
+ *
+ * @return zero on success or negative on error
+ */
void hip_set_sava_server_off(void)
{
hipsava_server = 0;
=== modified file 'test/handovers.sh' (properties changed: -x to +x)
=== modified file 'test/hipsetup.old' (properties changed: -x to +x)
=== modified file 'test/iperf_handovers.sh' (properties changed: -x to +x)
=== modified file 'test/maintainer/fix-archive-perms' (properties changed: -x
to +x)
=== modified file 'test/maintainer/sync-all' (properties changed: -x to +x)
=== modified file 'test/maintainer/tla-find-revision-locks' (properties
changed: -x to +x)
=== modified file 'test/packaging/debian-init.d-dnsproxy' (properties changed:
-x to +x)
=== modified file 'test/packaging/debian-init.d-hipd' (properties changed: -x
to +x)
=== modified file 'test/packaging/debian-init.d-hipfw' (properties changed: -x
to +x)
=== modified file 'test/packaging/fedora-init.d-bamboo_v4' (properties changed:
-x to +x)
=== modified file 'test/packaging/fedora-init.d-bamboo_v6' (properties changed:
-x to +x)
=== modified file 'test/packaging/rh-init.d-dnsproxy' (properties changed: -x
to +x)
=== modified file 'test/packaging/rh-init.d-hipd' (properties changed: -x to +x)
=== modified file 'test/packaging/rh-init.d-hipfw' (properties changed: -x to
+x)
=== modified file 'test/packaging/ubuntu-init.d-bamboo_v4' (properties changed:
-x to +x)
=== modified file 'test/packaging/ubuntu-init.d-bamboo_v6' (properties changed:
-x to +x)
=== modified file 'test/performance/clock_test.awk' (properties changed: -x to
+x)
=== modified file 'test/performance/genstats.awk' (properties changed: -x to +x)
=== modified file 'test/performance/parser.awk' (properties changed: -x to +x)
=== modified file 'test/performance/perf_measure.sh'
--- test/performance/perf_measure.sh 2010-03-03 17:23:31 +0000
+++ test/performance/perf_measure.sh 2010-03-19 09:20:44 +0000
@@ -16,7 +16,7 @@
MEASURE_RTT=0
MEASUREMENT_COUNT=10
TCP_LENGTH=
-FILE=0
+FILE=
RTT_POSTFIX=
TCP_POSTFIX=
UDP_POSTFIX=
@@ -39,7 +39,7 @@
exit 0
fi
-set -- `getopt a:b:c:l:n:rst: "$@"`
+set -- `getopt a:b:c:l:n:p:rst: "$@"`
[ $# -lt 1 ] && exit 1 # getopt failed
while [ $# -gt 0 ]
@@ -51,6 +51,7 @@
REMOTE_ADDRESS=$2; shift;;
-l) PACKET_LENGTH=$2; shift;;
-n) MEASUREMENT_COUNT=$2; shift;;
+ -p) FILE=$2; shift;;
-r) MEASURE_RTT=1;;
-s) RUN_MODE=2;;
-t) MEASURE_TPUT=$2; shift;;
@@ -66,9 +67,9 @@
TCP_LENGTH="-M "$PACKET_LENGTH
fi
-if [ $FILE -ne "0" ]
+if [ ! $FILE = "" ]
then
- OUTPUT="tee --append $FILE"
+ OUTPUT="tee -a $FILE"
RTT_POSTFIX="-rtt"
TCP_POSTFIX="-tcp"
UDP_POSTFIX="-udp"
@@ -81,14 +82,20 @@
then
read -p "Measure RTT: [ENTER]" TMP
+ # remove old measurement
+ if [ -e $OUTPUT$RTT_POSTFIX ]
+ then
+ rm $OUTPUT$RTT_POSTFIX
+ fi
+
if [ ! $REMOTE_ADDRESS = "0" ]
then
if [ $ADDR_FAMILY -eq "4" ]
then
- ping -c $MEASUREMENT_COUNT $REMOTE_ADDRESS #| $OUTPUT$RTT_POSTFIX
+ ping -c $MEASUREMENT_COUNT $REMOTE_ADDRESS | $OUTPUT$RTT_POSTFIX
elif [ $ADDR_FAMILY -eq "6" ]
then
- ping6 -c $MEASUREMENT_COUNT $REMOTE_ADDRESS #| $OUTPUT$RTT_POSTFIX
+ ping6 -c $MEASUREMENT_COUNT $REMOTE_ADDRESS | $OUTPUT$RTT_POSTFIX
else
echo "ERROR: Address family not specified."
exit 1
@@ -109,6 +116,12 @@
if [ $RUN_MODE -eq "1" -a ! $REMOTE_ADDRESS = "0" ]
then
+ # remove old measurement
+ if [ -e $OUTPUT$TCP_POSTFIX ]
+ then
+ rm $OUTPUT$TCP_POSTFIX
+ fi
+
i=0
if [ $ADDR_FAMILY -eq "4" ]
@@ -160,6 +173,12 @@
if [ $RUN_MODE -eq "1" -a ! $REMOTE_ADDRESS = "0" ]
then
+ # remove old measurement
+ if [ -e $OUTPUT$UDP_POSTFIX ]
+ then
+ rm $OUTPUT$UDP_POSTFIX
+ fi
+
i=0
if [ $ADDR_FAMILY -eq "4" ]
=== modified file 'test/performance/stats.pl' (properties changed: -x to +x)
=== modified file 'test/performance/switch-ip' (properties changed: -x to +x)
=== modified file 'test/performance/visualize-daemon.sh' (properties changed:
-x to +x)
=== modified file 'test/pfkeysettest' (properties changed: -x to +x)
=== modified file 'test/test-run-daemon' (properties changed: -x to +x)
=== modified file 'test/tla-hook' (properties changed: -x to +x)
=== modified file 'tools/hipl_autobuild'
--- tools/hipl_autobuild 2010-03-03 18:05:47 +0000
+++ tools/hipl_autobuild 2010-03-19 09:20:44 +0000
@@ -14,7 +14,6 @@
BRANCH_REVISION=$(bzr revno -q $BRANCH_URL)
BRANCH_REVISION_FILE=$BUILD_DIR/HIPL_REVISION_$BRANCH_NAME
AUTOBUILD_REVISION=$(cat $BRANCH_REVISION_FILE)
-AUTOBUILD_SCRIPT="$CHECKOUT_DIR/tools/hipl_autobuild"
# helper functions
run_program()
@@ -24,14 +23,16 @@
rm -f log.txt
return 0
else
+ SUBJECT="[$BRANCH_NAME] [autobuild] failing command: $@"
test $HIPL_NOTIFICATION_EMAIL &&
- mailx -s "autobuild failed: @$1 output:" $HIPL_NOTIFICATION_EMAIL
< log.txt
+ mailx -s "$SUBJECT" $HIPL_NOTIFICATION_EMAIL < log.txt
cleanup 1
fi
}
cleanup()
{
+ chmod -R u+rwx "$CHECKOUT_DIR"
rm -rf "$CHECKOUT_DIR"
echo $BRANCH_REVISION > $BRANCH_REVISION_FILE
exit $1
@@ -50,15 +51,6 @@
bzr checkout -q --lightweight $BRANCH_URL $CHECKOUT_DIR
-# Perform a self-update if the autobuild script in the repository has changed.
-# Only do this when running as the autobuild user so as not to interfere with
-# manual testing of this script.
-if test "$HIPL_AUTOBUILDER" = "yes" && ! cmp -s "$0" "$AUTOBUILD_SCRIPT" ; then
- cp "$AUTOBUILD_SCRIPT" $0
- rm -rf "$CHECKOUT_DIR"
- exec $0
-fi
-
cd "$CHECKOUT_DIR"
# Compile HIPL in different configurations
=== modified file 'tools/hosts.py' (properties changed: -x to +x)
=== modified file 'tools/nsupdate.pl' (properties changed: -x to +x)
Other related posts:
- » [hipl-commit] [release-1.0.5] Rev 3797: Syncronized to trunk revisions 3800..3811 - Miika Komu
