Increase logging verbosity as to what exactly hit a limit
authorjob <job@openbsd.org>
Thu, 30 May 2024 09:54:59 +0000 (09:54 +0000)
committerjob <job@openbsd.org>
Thu, 30 May 2024 09:54:59 +0000 (09:54 +0000)
rpki-client: https://testbed.krill.cloud/rrdp/notification.xml: pulling from network
rpki-client: https://testbed.krill.cloud/rrdp/notification.xml: downloading snapshot (bfb0a57e-d16b-44a1-9502-f15b4bc1ce1a#110135)
rpki-client: parse failed, snapshot element for rsync://testbed.krill.cloud/repo/testbed/0/DDAF321520EE4817D716FA047FC05FE2934204DB.crl too big
rpki-client: https://testbed.krill.cloud/rrdp/notification.xml: parse error at line 135: parsing aborted
rpki-client: https://testbed.krill.cloud/rrdp/notification.xml: load from network failed, fallback to rsync

OK tb@ claudio@

usr.sbin/rpki-client/rrdp_delta.c
usr.sbin/rpki-client/rrdp_snapshot.c

index 7b38669..6ee7e80 100644 (file)
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rrdp_delta.c,v 1.13 2024/03/22 03:38:12 job Exp $ */
+/*     $OpenBSD: rrdp_delta.c,v 1.14 2024/05/30 09:54:59 job Exp $ */
 /*
  * Copyright (c) 2020 Nils Fisher <nils_fisher@hotmail.com>
  * Copyright (c) 2021 Claudio Jeker <claudio@openbsd.org>
@@ -220,7 +220,8 @@ delta_content_handler(void *data, const char *content, int length)
 
        if (dxml->scope == DELTA_SCOPE_PUBLISH)
                if (publish_add_content(dxml->pxml, content, length) == -1)
-                       PARSE_FAIL(p, "parse failed - content too big");
+                       PARSE_FAIL(p, "parse failed, delta element for %s too "
+                           "big", dxml->pxml->uri);
 }
 
 static void
index 47c4380..bc1b184 100644 (file)
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rrdp_snapshot.c,v 1.9 2024/03/22 03:38:12 job Exp $ */
+/*     $OpenBSD: rrdp_snapshot.c,v 1.10 2024/05/30 09:54:59 job Exp $ */
 /*
  * Copyright (c) 2020 Nils Fisher <nils_fisher@hotmail.com>
  * Copyright (c) 2021 Claudio Jeker <claudio@openbsd.org>
@@ -200,7 +200,8 @@ snapshot_content_handler(void *data, const char *content, int length)
 
        if (sxml->scope == SNAPSHOT_SCOPE_PUBLISH)
                if (publish_add_content(sxml->pxml, content, length) == -1)
-                       PARSE_FAIL(p, "parse failed - content too big");
+                       PARSE_FAIL(p, "parse failed, snapshot element for %s "
+                           "too big", sxml->pxml->uri);
 }
 
 static void