Switch to refactored rpki-rtr implementation.

svn path=/trunk/; revision=5818

6 files changed, 16 insertions, 78 deletions

diff --git a/rp/rcynic/rcynic-cron b/rp/rcynic/rcynic-cron
index dc26e9a0..d56d706f 100755
--- a/rp/rcynic/rcynic-cron
+++ b/rp/rcynic/rcynic-cron
@@ -19,7 +19,7 @@
 # PERFORMANCE OF THIS SOFTWARE.
 
 """
-Cron job for rcynic and rtr-origin in stock configuration.
+Cron job for rcynic and rpki-rtr in stock configuration.
 
 Locking code here works like FreeBSD's lockf(1) utility given -k and
 -t 0 options, which is both the sanest and simplest combination for
@@ -95,8 +95,8 @@ if args.chroot:
 else:
   run(os.path.join(rpki.autoconf.bindir, "rcynic"), "-c", os.path.join(rpki.autoconf.sysconfdir, "rcynic.conf"))
 
-run(os.path.join(rpki.autoconf.bindir, "rtr-origin"),
-    "--cronjob", 
+run(os.path.join(rpki.autoconf.bindir, "rpki-rtr"),
+    "cronjob", 
     os.path.join(rpki.autoconf.RCYNIC_DIR, "data/authenticated"),
     cwd = os.path.join(rpki.autoconf.RCYNIC_DIR, "rpki-rtr"))
 
diff --git a/rp/rpki-rtr/Makefile.in b/rp/rpki-rtr/Makefile.in
index 11b493f0..4df3a119 100644
--- a/rp/rpki-rtr/Makefile.in
+++ b/rp/rpki-rtr/Makefile.in
@@ -1,6 +1,6 @@
 # $Id$
 
-BIN		= rtr-origin
+BIN		= rpki-rtr
 
 INSTALL		= @INSTALL@
 PYTHON		= @PYTHON@
diff --git a/rp/rpki-rtr/rpki-rtr b/rp/rpki-rtr/rpki-rtr
index 73c8836e..b764a0b3 100755
--- a/rp/rpki-rtr/rpki-rtr
+++ b/rp/rpki-rtr/rpki-rtr
@@ -18,65 +18,6 @@
 # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-"""
-RPKI-Router protocol implementation.  See RFC 6810 et sequalia in fine
-RFC and Internet-Draft repositories near you.
-"""
-
-import os
-import sys
-import time
-import logging
-import logging.handlers
-import argparse
-
-from rpki.rpki_rtr.server    import argparse_setup as argparse_setup_server
-from rpki.rpki_rtr.client    import argparse_setup as argparse_setup_client
-from rpki.rpki_rtr.generator import argparse_setup as argparse_setup_generator
-
-class Formatter(logging.Formatter):
-
-  converter = time.gmtime
-
-  def format(self, record):
-    if getattr(record, "connection", None) is None:
-      record.connection = ""
-    return super(Formatter, self).format(record)
-
-  def formatException(self, ei):
-    if args.debug:
-      return super(Formatter, self).formatException(ei)
-    else:
-      return str(ei[1])
-
-os.environ["TZ"] = "UTC"
-time.tzset()
-
-argparser = argparse.ArgumentParser(description = __doc__)
-argparser.add_argument("--debug", action = "store_true", help = "debugging mode")
-argparser.add_argument("--log-level", default = logging.DEBUG,
-                       choices = ("debug", "info", "warning", "error", "critical"),
-                       type = lambda s: int(getattr(logging, s.upper())))
-argparser.add_argument("--log-to",
-                       choices = ("syslog", "stderr"))
-subparsers = argparser.add_subparsers(title = "Commands", metavar = "", dest = "mode")
-argparse_setup_server(subparsers)
-argparse_setup_client(subparsers)
-argparse_setup_generator(subparsers)
-args = argparser.parse_args()
-
-fmt = "rpki-rtr/" + args.mode + "%(connection)s[%(process)d] %(message)s"
-
-if (args.log_to or args.default_log_to) == "stderr":
-  handler = logging.StreamHandler()
-  fmt = "%(asctime)s " + fmt
-elif os.path.exists("/dev/log"):
-  handler = logging.handlers.SysLogHandler("/dev/log")
-else:
-  handler = logging.handlers.SysLogHandler()
-
-handler.setFormatter(Formatter(fmt, "%Y-%m-%dT%H:%M:%SZ"))
-logging.root.addHandler(handler)
-logging.root.setLevel(args.log_level)
-
-sys.exit(args.func(args))
+if __name__ == "__main__":
+  from rpki.rpki_rtr.main import main
+  main()
diff --git a/rp/rpki-rtr/rules.freebsd.mk b/rp/rpki-rtr/rules.freebsd.mk
index c58e6332..f4d214a3 100644
--- a/rp/rpki-rtr/rules.freebsd.mk
+++ b/rp/rpki-rtr/rules.freebsd.mk
@@ -18,7 +18,7 @@ install-listener: .FORCE
 	@if /usr/bin/egrep -q "rpki-rtr[ 	]+stream[ 	]+tcp[ 	]" /etc/inetd.conf; \
 	then \
 	    echo "You already have an inetd.conf entry for rpki-rtr on TCPv4, so I will use it."; \
-	elif echo >>/etc/inetd.conf "rpki-rtr	stream	tcp	nowait	rpkirtr	/usr/local/bin/rtr-origin	rtr-origin --server /var/rcynic/rpki-rtr"; \
+	elif echo >>/etc/inetd.conf "rpki-rtr	stream	tcp	nowait	rpkirtr	/usr/local/bin/rpki-rtr	rpki-rtr server /var/rcynic/rpki-rtr"; \
 	then \
 	    echo "Added rpki-rtr for TCPv4 to /etc/inetd.conf."; \
 	else \
@@ -28,7 +28,7 @@ install-listener: .FORCE
 	@if /usr/bin/egrep -q "rpki-rtr[ 	]+stream[ 	]+tcp6[ 	]" /etc/inetd.conf; \
 	then \
 	    echo "You already have an inetd.conf entry for rpki-rtr on TCPv6, so I will use it."; \
-	elif echo >>/etc/inetd.conf "rpki-rtr	stream	tcp6	nowait	rpkirtr	/usr/local/bin/rtr-origin	rtr-origin --server /var/rcynic/rpki-rtr"; \
+	elif echo >>/etc/inetd.conf "rpki-rtr	stream	tcp6	nowait	rpkirtr	/usr/local/bin/rpki-rtr	rpki-rtr server /var/rcynic/rpki-rtr"; \
 	then \
 	    echo "Added rpki-rtr for TCPv6 to /etc/inetd.conf."; \
 	else \
diff --git a/rp/rpki-rtr/rules.linux.mk b/rp/rpki-rtr/rules.linux.mk
index 51c27b6b..d9b21590 100644
--- a/rp/rpki-rtr/rules.linux.mk
+++ b/rp/rpki-rtr/rules.linux.mk
@@ -21,7 +21,7 @@ ${DESTDIR}/etc/xinetd.d/rpki-rtr:
 	    print "    wait           = no"; \
 	    print "    user           = rpkirtr"; \
 	    print "    server         = ${bindir}/${BIN}"; \
-	    print "    server_args    = --server /var/rcynic/rpki-rtr"; \
+	    print "    server_args    = server /var/rcynic/rpki-rtr"; \
 	    print "}"; \
 	}' >xinetd.rpki-rtr
 	${INSTALL} -d ${DESTDIR}/etc/xinetd.d
diff --git a/rp/rpki-rtr/server.sh b/rp/rpki-rtr/server.sh
index 7ccf2f38..31b0bf68 100755
--- a/rp/rpki-rtr/server.sh
+++ b/rp/rpki-rtr/server.sh
@@ -1,17 +1,14 @@
 #!/bin/sh -
 #
-# Wrapper for rtr-origin.py in server mode, for testing.
+# Wrapper for rpki-rtr server, for testing.
 #
-# In production we would probably want to handle all of this either
-# directly in the Python code or in the command= setting for a
-# particular ssh key, but for initial testing it's simpler to run a
-# shall script to change to the right directory and supply any
-# necessary command line arguments.
+# In production we would probably want to handle all of this directly
+# in the command= setting for a particular ssh key, but for testing
+# it's often simpler to run a shall script to debug what arguments
+# and extra commands you might need.
 #
 # Be warned that almost any error here will cause the subsystem to
 # fail mysteriously, leaving behind naught but a SIGCHILD log message
 # from sshd as this script dies.
 
-cd /u/sra/rpki/subvert-rpki.hactrn.net/rtr-origin
-
-exec /usr/local/bin/python rtr-origin.py --server
+exec /usr/local/bin/rpki-rtr server /var/rcynic/rpki-rtr