[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[minion-cvs] Last round (I hope) of code tweaks before 0.0.1. Only ...
Update of /home/minion/cvsroot/src/minion
In directory moria.mit.edu:/tmp/cvs-serv2678
Modified Files:
LICENSE Makefile TODO setup.py
Log Message:
Last round (I hope) of code tweaks before 0.0.1. Only system tests and docs remain!
Refactoring:
- Move _base64 from ServerInfo to formatBase64 in Common
- Finish separating server code.
- Move ServerConfig to new file
- Move Server key mgt to new file
- Don't warn on missing overwrite; we now override.
- Minimize calls to true RNG
Everywhere:
- Remove extraneous whitespace
- Wrap overlong lines
- Remove extraneous import statements
- Give all modules sane __all__ fields
- Make Pychecker pleased.
Index: LICENSE
===================================================================
RCS file: /home/minion/cvsroot/src/minion/LICENSE,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- LICENSE 11 Dec 2002 05:57:04 -0000 1.3
+++ LICENSE 12 Dec 2002 19:56:45 -0000 1.4
@@ -73,7 +73,7 @@
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.
-
+
Finally, software patents pose a constant threat to the existence of
any free program. We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
@@ -129,7 +129,7 @@
"work based on the library" and a "work that uses the library". The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.
-
+
GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@@ -164,7 +164,7 @@
on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does.
-
+
1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
@@ -176,7 +176,7 @@
You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.
-
+
2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
@@ -234,7 +234,7 @@
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.) Do not make any other change in
these notices.
-
+
Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.
@@ -285,7 +285,7 @@
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.
-
+
6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
@@ -347,7 +347,7 @@
accompany the operating system. Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.
-
+
7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
@@ -388,7 +388,7 @@
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.
-
+
11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
@@ -440,7 +440,7 @@
the Free Software Foundation. If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.
-
+
14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission. For software which is
@@ -474,7 +474,7 @@
DAMAGES.
END OF TERMS AND CONDITIONS
-
+
How to Apply These Terms to Your New Libraries
If you develop a new library, and you want it to be of the greatest
Index: Makefile
===================================================================
RCS file: /home/minion/cvsroot/src/minion/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile 7 Dec 2002 03:53:25 -0000 1.14
+++ Makefile 12 Dec 2002 19:56:45 -0000 1.15
@@ -3,7 +3,7 @@
# Okay, we'll start with a little make magic. The goal is to define the
# make variable '$(FINDPYTHON)' as a chunk of shell script that sets
-# the shell variable '$PYTHON' to a working python2 interpreter.
+# the shell variable '$PYTHON' to a working python2 interpreter.
#
# (This is nontrivial because not all python2 installers install a command
# called 'python2'.)
@@ -78,7 +78,7 @@
( export PYTHONPATH=.; cd build/lib*; pychecker -F ../../pycheckrc ./mixminion/*.py )
lines:
- wc -l src/*.[ch] lib/*/*.py
+ wc -l src/*.[ch] lib/*/*.py lib/*/*/*.py
xxxx:
find lib src \( -name '*.py' -or -name '*.[ch]' \) -print0 \
@@ -88,8 +88,12 @@
find lib src \( -name '*.py' -or -name '*.[ch]' \) -print0 \
| xargs -0 grep 'XXXX001\|FFFF001\|DOCDOC\|????001'
+longlines:
+ find lib src \( -name '*.py' -or -name '*.[ch]' \) -print0 \
+ | xargs -0 grep '^.{80,}'
+
#
-# Targets to make openssl get built properly.
+# Targets to make openssl get built properly.
#
OPENSSL_URL = ftp://ftp.openssl.org/source/openssl-0.9.7-beta4.tar.gz
OPENSSL_FILE = openssl-0.9.7-beta4.tar.gz
Index: TODO
===================================================================
RCS file: /home/minion/cvsroot/src/minion/TODO,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- TODO 11 Dec 2002 06:58:54 -0000 1.37
+++ TODO 12 Dec 2002 19:56:45 -0000 1.38
@@ -16,28 +16,12 @@
work. There need not be an interface for replies. Key rotation
need not be automated.]
- o Server
- o Unit tests for modulemanger built-in decoding and delivery.
. Build
- Marginal 'make install'
- Marginal 'make dist'
. Integration testing
- Automated tests for several servers running on one machine.
- Tests for servers on several different machines.
- . Refactor
- o Move exit types and addresses into Packet.py
- o Disable 'non-state-carrying' reply blocks. Rename 'stateful'
- (non-state-carrying) and 'stateless' (state-carrying) to
- something less contradictory
- o Fix all {XXXX/FFFF/????}001
- . Separate package for server code.
- o Create new package.
- o Move hashlog, mmtpserver, queue, modules,
- packetHandler, and servermain into new package.
- - Split Config, ServerInfo.
- . Final license
- o Apply LGPL
- - Mark all files with note?
- Documentation
- Contributor's guide
- Basic HOWTO
Index: setup.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/setup.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- setup.py 11 Dec 2002 06:58:55 -0000 1.12
+++ setup.py 12 Dec 2002 19:56:45 -0000 1.13
@@ -27,7 +27,7 @@
if USE_OPENSSL:
# For now, we assume that openssl-0.9.7 hasn't been released. When this
# changes, we can fix this rigamarole.
- openssl_inc = os.environ.get("MM_OPENSSL_INCLUDE",
+ openssl_inc = os.environ.get("MM_OPENSSL_INCLUDE",
"./contrib/openssl/include")
INCLUDE_DIRS=[openssl_inc]
STATIC_LIBS=['./contrib/openssl/libssl.a', './contrib/openssl/libcrypto.a']
@@ -49,7 +49,7 @@
# Detect endian-ness
#XXXX This breaks cross-compilation, but might be good enough for now.
-num = struct.pack("@I", 0x01020304)
+num = struct.pack("@I", 0x01020304)
big_endian = (num== "\x01\x02\x03\x04")
little_endian = (num=="\x04\x03\x02\x01")
other_endian = not (big_endian or little_endian)