diff options
| author | Rob Austein <sra@hactrn.net> | 2015-10-09 13:51:58 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2015-10-09 13:51:58 +0000 |
| commit | 122d0b33982d94f8a6c96356462a2d6fa062d948 (patch) | |
| tree | 1f142c63f575448d41c1548f5ae27813f55f3c54 /rpki/rootd.py | |
| parent | 421546d23d86434190caa9bb301e5cb7e96d4889 (diff) | |
Baby steps towards using new rpkidb models. Now that SAX is gone,
clean up some of the corresponding mess.
svn path=/branches/tk705/; revision=6105
Diffstat (limited to 'rpki/rootd.py')
| -rw-r--r-- | rpki/rootd.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rpki/rootd.py b/rpki/rootd.py index 622343a6..32b6038b 100644 --- a/rpki/rootd.py +++ b/rpki/rootd.py @@ -259,7 +259,7 @@ class main(object): for q_pdu in q_msg: logger.info("Sending %s to pubd", q_pdu.get("uri")) r_msg = rpki.http_simple.client( - proto_cms_msg = rpki.publication.cms_msg_no_sax, + proto_cms_msg = rpki.publication.cms_msg, client_key = self.rootd_bpki_key, client_cert = self.rootd_bpki_cert, client_crl = self.rootd_bpki_crl, @@ -345,7 +345,7 @@ class main(object): def handler(self, request, q_der): try: - q_cms = rpki.up_down.cms_msg_no_sax(DER = q_der) + q_cms = rpki.up_down.cms_msg(DER = q_der) q_msg = q_cms.unwrap((self.bpki_ta, self.child_bpki_cert)) q_type = q_msg.get("type") logger.info("Serving %s query", q_type) @@ -357,8 +357,8 @@ class main(object): except Exception, e: logger.exception("Exception processing up-down %s message", q_type) rpki.up_down.generate_error_response_from_exception(r_msg, e, q_type) - request.send_cms_response(rpki.up_down.cms_msg_no_sax().wrap(r_msg, self.rootd_bpki_key, self.rootd_bpki_cert, - self.rootd_bpki_crl if self.include_bpki_crl else None)) + request.send_cms_response(rpki.up_down.cms_msg().wrap(r_msg, self.rootd_bpki_key, self.rootd_bpki_cert, + self.rootd_bpki_crl if self.include_bpki_crl else None)) except Exception, e: logger.exception("Unhandled exception processing up-down message") request.send_error(500, "Unhandled exception %s: %s" % (e.__class__.__name__, e)) |