summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorBruce Montrose <montrose@itd.nrl.navy.mil>2002-07-09 19:51:41 +0000
committerBruce Montrose <montrose@itd.nrl.navy.mil>2002-07-09 19:51:41 +0000
commit62ead018a16d6a1a1e12f9c6183fbd2e4a11ec3d (patch)
tree767d1c73a6a2139ff2d5ade039c58fed24970d05 /src/or
parent0a3da3ae37dc048f6079d0e4cffd057d07e13216 (diff)
downloadtor-62ead018a16d6a1a1e12f9c6183fbd2e4a11ec3d.tar.gz
tor-62ead018a16d6a1a1e12f9c6183fbd2e4a11ec3d.zip
Miscellaneous bug fixes / activated "make check" for src/or
svn:r31
Diffstat (limited to 'src/or')
-rw-r--r--src/or/Makefile.am8
-rw-r--r--src/or/config.c7
2 files changed, 13 insertions, 2 deletions
diff --git a/src/or/Makefile.am b/src/or/Makefile.am
index d0e78a5525..f296776902 100644
--- a/src/or/Makefile.am
+++ b/src/or/Makefile.am
@@ -1,4 +1,8 @@
+TESTS = test_config
+
+noinst_PROGRAMS = test_config
+
bin_PROGRAMS = or
or_LDADD = -L../common -lor
@@ -7,6 +11,10 @@ or_SOURCES = args.c buffers.c cell.c circuit.c command.c connection.c \
connection_exit.c connection_ap.c connection_op.c connection_or.c config.c \
main.c onion.c routers.c
+test_config_SOURCES = test_config.c
+
+test_config_LDADD = config.o -L../common -lor
+
noinst_HEADERS = or.h
diff --git a/src/or/config.c b/src/or/config.c
index 619f6497a3..e70e1a17b7 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -8,6 +8,9 @@
/*
* Changes :
* $Log$
+ * Revision 1.5 2002/07/09 19:51:41 montrose
+ * Miscellaneous bug fixes / activated "make check" for src/or
+ *
* Revision 1.4 2002/07/03 19:58:18 montrose
* minor bug fix in error checking
*
@@ -117,10 +120,10 @@ RETURN VALUE: 0 on success, non-zero on error
case -1:
if ( Verbose ) /* display options upon user request */
{
- printf("\nLogLevel=%s\n",options->LogLevel);
+ printf("LogLevel=%s\n",options->LogLevel);
printf("RouterFile=%s, PrivateKeyFile=%s\n",options->RouterFile,options->PrivateKeyFile);
printf("ORPort=%d, OPPort=%d, APPort=%d\n",options->ORPort,options->OPPort,options->APPort);
- printf("CoinWeight=%6.4f, MaxConn=%d, TrafficShaping=%d\n\n",options->CoinWeight,options->MaxConn,options->TrafficShaping);
+ printf("CoinWeight=%6.4f, MaxConn=%d, TrafficShaping=%d\n",options->CoinWeight,options->MaxConn,options->TrafficShaping);
}
code = 0;
break;